Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / app_list / app_list_syncable_service_factory.h

diff --git a/src/chrome/browser/ui/app_list/app_list_syncable_service_factory.h b/src/chrome/browser/ui/app_list/app_list_syncable_service_factory.h
index 823fd1e..9caac4d 100644 (file)
--- a/src/chrome/browser/ui/app_list/app_list_syncable_service_factory.h
+++ b/src/chrome/browser/ui/app_list/app_list_syncable_service_factory.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/singleton.h"
-#include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h"
+#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 
 class Profile;
 
@@ -24,20 +24,24 @@ class AppListSyncableServiceFactory : public BrowserContextKeyedServiceFactory {
 
   static AppListSyncableServiceFactory* GetInstance();
 
+  static KeyedService* BuildInstanceFor(
+      content::BrowserContext* browser_context);
+
  private:
   friend struct DefaultSingletonTraits<AppListSyncableServiceFactory>;
 
   AppListSyncableServiceFactory();
-  virtual ~AppListSyncableServiceFactory();
+  ~AppListSyncableServiceFactory() override;
 
   // BrowserContextKeyedServiceFactory:
-  virtual BrowserContextKeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* profile) const OVERRIDE;
-  virtual void RegisterProfilePrefs(
-      user_prefs::PrefRegistrySyncable* registry) OVERRIDE;
-  virtual content::BrowserContext* GetBrowserContextToUse(
-      content::BrowserContext* context) const OVERRIDE;
-  virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE;
+  KeyedService* BuildServiceInstanceFor(
+      content::BrowserContext* profile) const override;
+  void RegisterProfilePrefs(
+      user_prefs::PrefRegistrySyncable* registry) override;
+  content::BrowserContext* GetBrowserContextToUse(
+      content::BrowserContext* context) const override;
+  bool ServiceIsCreatedWithBrowserContext() const override;
+  bool ServiceIsNULLWhileTesting() const override;
 
   DISALLOW_COPY_AND_ASSIGN(AppListSyncableServiceFactory);
 };