Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / ownership / owner_settings_service_chromeos_factory.h

diff --git a/src/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h b/src/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h
index 3409456..1774fa7 100644 (file)
--- a/src/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h
+++ b/src/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h
@@ -20,6 +20,7 @@ class OwnerKeyUtil;
 
 namespace chromeos {
 
+class DeviceSettingsService;
 class OwnerSettingsServiceChromeOS;
 
 class OwnerSettingsServiceChromeOSFactory
@@ -29,6 +30,9 @@ class OwnerSettingsServiceChromeOSFactory
 
   static OwnerSettingsServiceChromeOSFactory* GetInstance();
 
+  static void SetDeviceSettingsServiceForTesting(
+      DeviceSettingsService* device_settings_service);
+
   scoped_refptr<ownership::OwnerKeyUtil> GetOwnerKeyUtil();
 
   void SetOwnerKeyUtilForTesting(
@@ -43,11 +47,11 @@ class OwnerSettingsServiceChromeOSFactory
   static KeyedService* BuildInstanceFor(content::BrowserContext* context);
 
   // BrowserContextKeyedBaseFactory overrides:
-  virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE;
+  virtual bool ServiceIsCreatedWithBrowserContext() const override;
 
   // BrowserContextKeyedServiceFactory implementation:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* browser_context) const OVERRIDE;
+      content::BrowserContext* browser_context) const override;
 
   scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_;