Revert "Non-plafrom-specific part of an OwnerSettingsService is moved to components/ownership/*."

chrome/browser/chromeos/ownership/owner_settings_service_factory.h

Index: chrome/browser/chromeos/ownership/owner_settings_service_factory.h
diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h b/chrome/browser/chromeos/ownership/owner_settings_service_factory.h
similarity index 70%
rename from chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h
rename to chrome/browser/chromeos/ownership/owner_settings_service_factory.h
index 3409456ef6c80cadf9e895425165a0d3b11eb188..597656b76ad20a744f81ca46c8f0068c224bb3c0 100644
--- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h
+++ b/chrome/browser/chromeos/ownership/owner_settings_service_factory.h
@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_FACTORY_H_
-#define CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_FACTORY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_FACTORY_H_
+#define CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_FACTORY_H_
+
+#include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ -20,14 +22,13 @@ class OwnerKeyUtil;
 
 namespace chromeos {
 
-class OwnerSettingsServiceChromeOS;
+class OwnerSettingsService;
 
-class OwnerSettingsServiceChromeOSFactory
-    : public BrowserContextKeyedServiceFactory {
+class OwnerSettingsServiceFactory : public BrowserContextKeyedServiceFactory {
  public:
-  static OwnerSettingsServiceChromeOS* GetForProfile(Profile* profile);
+  static OwnerSettingsService* GetForProfile(Profile* profile);
 
-  static OwnerSettingsServiceChromeOSFactory* GetInstance();
+  static OwnerSettingsServiceFactory* GetInstance();
 
   scoped_refptr<ownership::OwnerKeyUtil> GetOwnerKeyUtil();
 
@@ -35,10 +36,10 @@ class OwnerSettingsServiceChromeOSFactory
       const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util);
 
  private:
-  friend struct DefaultSingletonTraits<OwnerSettingsServiceChromeOSFactory>;
+  friend struct DefaultSingletonTraits<OwnerSettingsServiceFactory>;
 
-  OwnerSettingsServiceChromeOSFactory();
-  virtual ~OwnerSettingsServiceChromeOSFactory();
+  OwnerSettingsServiceFactory();
+  virtual ~OwnerSettingsServiceFactory();
 
   static KeyedService* BuildInstanceFor(content::BrowserContext* context);
 
@@ -51,9 +52,9 @@ class OwnerSettingsServiceChromeOSFactory
 
   scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_;
 
-  DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceChromeOSFactory);
+  DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceFactory);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_FACTORY_H_
+#endif  // CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_FACTORY_H_