Revert of Implemented OwnerSettingsService::Set() method.

chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc

Index: chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc
diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc
index afe0480125f43757531956af0d18206dd6c0ac29..b971f3407aee5953c657ed4ca0677ff88650a47b 100644
--- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc
+++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc
@@ -7,7 +7,6 @@
 #include "base/path_service.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/chromeos_paths.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
@@ -15,19 +14,6 @@
 #include "components/ownership/owner_key_util_impl.h"
 
 namespace chromeos {
-
-namespace {
-
-DeviceSettingsService* g_device_settings_service_for_testing_ = nullptr;
-
-DeviceSettingsService* GetDeviceSettingsService() {
-  if (g_device_settings_service_for_testing_)
-    return g_device_settings_service_for_testing_;
-  return DeviceSettingsService::IsInitialized() ? DeviceSettingsService::Get()
-                                                : nullptr;
-}
-
-}  // namespace
 
 OwnerSettingsServiceChromeOSFactory::OwnerSettingsServiceChromeOSFactory()
     : BrowserContextKeyedServiceFactory(
@@ -49,12 +35,6 @@
 OwnerSettingsServiceChromeOSFactory*
 OwnerSettingsServiceChromeOSFactory::GetInstance() {
   return Singleton<OwnerSettingsServiceChromeOSFactory>::get();
-}
-
-// static
-void OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting(
-    DeviceSettingsService* device_settings_service) {
-  g_device_settings_service_for_testing_ = device_settings_service;
 }
 
 scoped_refptr<ownership::OwnerKeyUtil>
@@ -79,10 +59,8 @@
   Profile* profile = static_cast<Profile*>(browser_context);
   if (profile->IsGuestSession() || ProfileHelper::IsSigninProfile(profile))
     return NULL;
-  return new OwnerSettingsServiceChromeOS(
-      GetDeviceSettingsService(),
-      profile,
-      GetInstance()->GetOwnerKeyUtil());
+  return new OwnerSettingsServiceChromeOS(profile,
+                                          GetInstance()->GetOwnerKeyUtil());
 }
 
 bool OwnerSettingsServiceChromeOSFactory::ServiceIsCreatedWithBrowserContext()