Revert 154457 - Switch from SignedSettings to DeviceSettingsService.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
===================================================================
--- chrome/browser/chromeos/chrome_browser_main_chromeos.cc	(revision 154482)
+++ chrome/browser/chromeos/chrome_browser_main_chromeos.cc	(working copy)
@@ -50,8 +50,8 @@
 #include "chrome/browser/chromeos/power/screen_lock_observer.h"
 #include "chrome/browser/chromeos/power/user_activity_notifier.h"
 #include "chrome/browser/chromeos/power/video_activity_notifier.h"
-#include "chrome/browser/chromeos/settings/device_settings_service.h"
-#include "chrome/browser/chromeos/settings/owner_key_util.h"
+#include "chrome/browser/chromeos/settings/ownership_service.h"
+#include "chrome/browser/chromeos/settings/session_manager_observer.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/chromeos/system_key_event_listener.h"
 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h"
@@ -294,11 +294,9 @@
 
   chromeos::CrosDBusService::Initialize();
 
-  // Initialize the device settings service so that we'll take actions per
-  // signals sent from the session manager.
-  chromeos::DeviceSettingsService::Get()->Initialize(
-      chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
-      chromeos::OwnerKeyUtil::Create());
+  // Initialize the session manager observer so that we'll take actions
+  // per signals sent from the session manager.
+  session_manager_observer_.reset(new chromeos::SessionManagerObserver);
 
   chromeos::disks::DiskMountManager::Initialize();
   chromeos::mtp::MediaTransferProtocolManager::Initialize();
@@ -351,7 +349,7 @@
   chromeos::BootTimesLoader::Get()->RecordChromeMainStats();
 
   // Trigger prefetching of ownership status.
-  chromeos::DeviceSettingsService::Get()->Load();
+  chromeos::OwnershipService::GetSharedInstance()->Prewarm();
 
   // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
   // -- just before CreateProfile().
@@ -522,11 +520,9 @@
   if (chromeos::CrosNetworkChangeNotifierFactory::GetInstance())
     chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Shutdown();
 
-  // Tell DeviceSettingsService to stop talking to session_manager.
-  chromeos::DeviceSettingsService::Get()->Shutdown();
-
   // We should remove observers attached to D-Bus clients before
   // DBusThreadManager is shut down.
+  session_manager_observer_.reset();
   screen_lock_observer_.reset();
   resume_observer_.reset();
   brightness_observer_.reset();