Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / profile_resetter / profile_resetter_unittest.cc

diff --git a/src/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/src/chrome/browser/profile_resetter/profile_resetter_unittest.cc
index cbaf232..b487a46 100644 (file)
--- a/src/chrome/browser/profile_resetter/profile_resetter_unittest.cc
+++ b/src/chrome/browser/profile_resetter/profile_resetter_unittest.cc
@@ -8,7 +8,6 @@
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/scoped_path_override.h"
-#include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
 #include "chrome/browser/extensions/tab_helper.h"
@@ -24,6 +23,7 @@
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/google/core/browser/google_pref_names.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/search_engines/template_url_service_client.h"
@@ -100,10 +100,10 @@ class ProfileResetterTest : public extensions::ExtensionServiceTestBase,
                             public ProfileResetterTestBase {
  public:
   ProfileResetterTest();
-  virtual ~ProfileResetterTest();
+  ~ProfileResetterTest() override;
 
  protected:
-  virtual void SetUp() OVERRIDE;
+  void SetUp() override;
 
   TestingProfile* profile() { return profile_.get(); }
 
@@ -161,7 +161,7 @@ KeyedService* ProfileResetterTest::CreateTemplateURLService(
 class PinnedTabsResetTest : public BrowserWithTestWindowTest,
                             public ProfileResetterTestBase {
  protected:
-  virtual void SetUp() OVERRIDE;
+  void SetUp() override;
 
   content::WebContents* CreateWebContents();
 };
@@ -182,9 +182,9 @@ content::WebContents* PinnedTabsResetTest::CreateWebContents() {
 // URLFetcher delegate that simply records the upload data.
 struct URLFetcherRequestListener : net::URLFetcherDelegate {
   URLFetcherRequestListener();
-  virtual ~URLFetcherRequestListener();
+  ~URLFetcherRequestListener() override;
 
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   std::string upload_data;
   net::URLFetcherDelegate* real_delegate;