Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / browsing_data / browsing_data_remover_unittest.cc

diff --git a/src/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/src/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index 8153ce5..e8b895d 100644 (file)
--- a/src/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/src/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -133,41 +133,30 @@ struct StoragePartitionRemovalData {
 class TestStoragePartition : public StoragePartition {
  public:
   TestStoragePartition() {}
-  virtual ~TestStoragePartition() {}
+  ~TestStoragePartition() override {}
 
   // content::StoragePartition implementation.
-  virtual base::FilePath GetPath() OVERRIDE { return base::FilePath(); }
-  virtual net::URLRequestContextGetter* GetURLRequestContext() OVERRIDE {
+  base::FilePath GetPath() override { return base::FilePath(); }
+  net::URLRequestContextGetter* GetURLRequestContext() override { return NULL; }
+  net::URLRequestContextGetter* GetMediaURLRequestContext() override {
     return NULL;
   }
-  virtual net::URLRequestContextGetter* GetMediaURLRequestContext() OVERRIDE {
-    return NULL;
-  }
-  virtual storage::QuotaManager* GetQuotaManager() OVERRIDE { return NULL; }
-  virtual content::AppCacheService* GetAppCacheService() OVERRIDE {
-    return NULL;
-  }
-  virtual storage::FileSystemContext* GetFileSystemContext() OVERRIDE {
-    return NULL;
-  }
-  virtual storage::DatabaseTracker* GetDatabaseTracker() OVERRIDE {
-    return NULL;
-  }
-  virtual content::DOMStorageContext* GetDOMStorageContext() OVERRIDE {
-    return NULL;
-  }
-  virtual content::IndexedDBContext* GetIndexedDBContext() OVERRIDE {
-    return NULL;
-  }
-  virtual content::ServiceWorkerContext* GetServiceWorkerContext() OVERRIDE {
+  storage::QuotaManager* GetQuotaManager() override { return NULL; }
+  content::AppCacheService* GetAppCacheService() override { return NULL; }
+  storage::FileSystemContext* GetFileSystemContext() override { return NULL; }
+  storage::DatabaseTracker* GetDatabaseTracker() override { return NULL; }
+  content::DOMStorageContext* GetDOMStorageContext() override { return NULL; }
+  content::IndexedDBContext* GetIndexedDBContext() override { return NULL; }
+  content::ServiceWorkerContext* GetServiceWorkerContext() override {
     return NULL;
   }
+  content::GeofencingManager* GetGeofencingManager() override { return NULL; }
 
-  virtual void ClearDataForOrigin(uint32 remove_mask,
-                                  uint32 quota_storage_remove_mask,
-                                  const GURL& storage_origin,
-                                  net::URLRequestContextGetter* rq_context,
-                                  const base::Closure& callback) OVERRIDE {
+  void ClearDataForOrigin(uint32 remove_mask,
+                          uint32 quota_storage_remove_mask,
+                          const GURL& storage_origin,
+                          net::URLRequestContextGetter* rq_context,
+                          const base::Closure& callback) override {
     BrowserThread::PostTask(BrowserThread::UI,
                             FROM_HERE,
                             base::Bind(&TestStoragePartition::AsyncRunCallback,
@@ -175,13 +164,13 @@ class TestStoragePartition : public StoragePartition {
                                        callback));
   }
 
-  virtual void ClearData(uint32 remove_mask,
-                         uint32 quota_storage_remove_mask,
-                         const GURL& storage_origin,
-                         const OriginMatcherFunction& origin_matcher,
-                         const base::Time begin,
-                         const base::Time end,
-                         const base::Closure& callback) OVERRIDE {
+  void ClearData(uint32 remove_mask,
+                 uint32 quota_storage_remove_mask,
+                 const GURL& storage_origin,
+                 const OriginMatcherFunction& origin_matcher,
+                 const base::Time begin,
+                 const base::Time end,
+                 const base::Closure& callback) override {
     // Store stuff to verify parameters' correctness later.
     storage_partition_removal_data_.remove_mask = remove_mask;
     storage_partition_removal_data_.quota_storage_remove_mask =
@@ -317,7 +306,7 @@ class RemoveChannelIDTester : public net::SSLConfigService::Observer {
     ssl_config_service_->AddObserver(this);
   }
 
-  virtual ~RemoveChannelIDTester() {
+  ~RemoveChannelIDTester() override {
     ssl_config_service_->RemoveObserver(this);
   }
 
@@ -361,9 +350,7 @@ class RemoveChannelIDTester : public net::SSLConfigService::Observer {
   }
 
   // net::SSLConfigService::Observer implementation:
-  virtual void OnSSLConfigChanged() OVERRIDE {
-    ssl_config_changed_count_++;
-  }
+  void OnSSLConfigChanged() override { ssl_config_changed_count_++; }
 
  private:
   static void GetAllChannelIDsCallback(
@@ -441,7 +428,7 @@ class RemoveAutofillTester : public autofill::PersonalDataManagerObserver {
     personal_data_manager_->AddObserver(this);
   }
 
-  virtual ~RemoveAutofillTester() {
+  ~RemoveAutofillTester() override {
     personal_data_manager_->RemoveObserver(this);
   }
 
@@ -512,7 +499,7 @@ class RemoveAutofillTester : public autofill::PersonalDataManagerObserver {
   }
 
  private:
-  virtual void OnPersonalDataChanged() OVERRIDE {
+  void OnPersonalDataChanged() override {
     base::MessageLoop::current()->Quit();
   }
 
@@ -597,25 +584,24 @@ class MockDomainReliabilityService : public DomainReliabilityService {
  public:
   MockDomainReliabilityService() : clear_count_(0) {}
 
-  virtual ~MockDomainReliabilityService() {}
+  ~MockDomainReliabilityService() override {}
 
-  virtual scoped_ptr<DomainReliabilityMonitor> CreateMonitor(
+  scoped_ptr<DomainReliabilityMonitor> CreateMonitor(
       scoped_refptr<base::SingleThreadTaskRunner> network_task_runner)
-      OVERRIDE {
+      override {
     NOTREACHED();
     return scoped_ptr<DomainReliabilityMonitor>();
   }
 
-  virtual void ClearBrowsingData(DomainReliabilityClearMode clear_mode,
-                                 const base::Closure& callback) OVERRIDE {
+  void ClearBrowsingData(DomainReliabilityClearMode clear_mode,
+                         const base::Closure& callback) override {
     clear_count_++;
     last_clear_mode_ = clear_mode;
     callback.Run();
   }
 
-  virtual void GetWebUIData(
-      const base::Callback<void(scoped_ptr<base::Value>)>& callback)
-      const OVERRIDE {
+  void GetWebUIData(const base::Callback<void(scoped_ptr<base::Value>)>&
+                        callback) const override {
     NOTREACHED();
   }
 
@@ -638,7 +624,7 @@ struct TestingDomainReliabilityServiceFactoryUserData
       : context(context),
         service(service),
         attached(false) {}
-  virtual ~TestingDomainReliabilityServiceFactoryUserData() {}
+  ~TestingDomainReliabilityServiceFactoryUserData() override {}
 
   content::BrowserContext* const context;
   MockDomainReliabilityService* const service;
@@ -717,10 +703,9 @@ class BrowsingDataRemoverTest : public testing::Test,
                    content::Source<Profile>(profile_.get()));
   }
 
-  virtual ~BrowsingDataRemoverTest() {
-  }
+  ~BrowsingDataRemoverTest() override {}
 
-  virtual void TearDown() {
+  void TearDown() override {
 #if defined(ENABLE_EXTENSIONS)
     mock_policy_ = NULL;
 #endif
@@ -801,9 +786,9 @@ class BrowsingDataRemoverTest : public testing::Test,
   }
 
   // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override {
     DCHECK_EQ(type, chrome::NOTIFICATION_BROWSING_DATA_REMOVED);
 
     // We're not taking ownership of the details object, but storing a copy of