Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / themes / theme_syncable_service_unittest.cc

diff --git a/src/chrome/browser/themes/theme_syncable_service_unittest.cc b/src/chrome/browser/themes/theme_syncable_service_unittest.cc
index c671452..265133d 100644 (file)
--- a/src/chrome/browser/themes/theme_syncable_service_unittest.cc
+++ b/src/chrome/browser/themes/theme_syncable_service_unittest.cc
@@ -14,13 +14,12 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
-#include "chrome/common/extensions/manifest_url_handler.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/common/extension.h"
-#include "extensions/common/extension_messages.h"
 #include "extensions/common/manifest_constants.h"
+#include "extensions/common/manifest_url_handlers.h"
 #include "extensions/common/permissions/api_permission_set.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "sync/api/attachments/attachment_id.h"
@@ -62,36 +61,32 @@ class FakeThemeService : public ThemeService {
     is_dirty_(false) {}
 
   // ThemeService implementation
-  virtual void SetTheme(const extensions::Extension* extension) OVERRIDE {
+  void SetTheme(const extensions::Extension* extension) override {
     is_dirty_ = true;
     theme_extension_ = extension;
     using_system_theme_ = false;
     using_default_theme_ = false;
   }
 
-  virtual void UseDefaultTheme() OVERRIDE {
+  void UseDefaultTheme() override {
     is_dirty_ = true;
     using_default_theme_ = true;
     using_system_theme_ = false;
     theme_extension_ = NULL;
   }
 
-  virtual void UseSystemTheme() OVERRIDE {
+  void UseSystemTheme() override {
     is_dirty_ = true;
     using_system_theme_ = true;
     using_default_theme_ = false;
     theme_extension_ = NULL;
   }
 
-  virtual bool UsingDefaultTheme() const OVERRIDE {
-    return using_default_theme_;
-  }
+  bool UsingDefaultTheme() const override { return using_default_theme_; }
 
-  virtual bool UsingSystemTheme() const OVERRIDE {
-    return using_system_theme_;
-  }
+  bool UsingSystemTheme() const override { return using_system_theme_; }
 
-  virtual string GetThemeID() const OVERRIDE {
+  string GetThemeID() const override {
     if (theme_extension_.get())
       return theme_extension_->id();
     else
@@ -150,9 +145,9 @@ class ThemeSyncableServiceTest : public testing::Test {
         file_thread_(content::BrowserThread::FILE, &loop_),
         fake_theme_service_(NULL) {}
 
-  virtual ~ThemeSyncableServiceTest() {}
+  ~ThemeSyncableServiceTest() override {}
 
-  virtual void SetUp() {
+  void SetUp() override {
     profile_.reset(new TestingProfile);
     fake_theme_service_ = BuildForProfile(profile_.get());
     theme_sync_service_.reset(new ThemeSyncableService(profile_.get(),
@@ -161,7 +156,7 @@ class ThemeSyncableServiceTest : public testing::Test {
     SetUpExtension();
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     profile_.reset();
     loop_.RunUntilIdle();
   }
@@ -237,7 +232,7 @@ class ThemeSyncableServiceTest : public testing::Test {
 };
 
 class PolicyInstalledThemeTest : public ThemeSyncableServiceTest {
-  virtual extensions::Manifest::Location GetThemeLocation() OVERRIDE {
+  extensions::Manifest::Location GetThemeLocation() override {
     return extensions::Manifest::EXTERNAL_POLICY_DOWNLOAD;
   }
 };