Switch from SignedSettings to DeviceSettingsService.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index d20aa7062f4e4061fe41dca5752119322c60e250..9b0a0374d64adc8f43a66749ef107419f143c23c 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -30,11 +30,11 @@
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
+#include "chrome/browser/chromeos/login/device_settings_service.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/login_wizard.h"
-#include "chrome/browser/chromeos/login/ownership_service.h"
+#include "chrome/browser/chromeos/login/owner_key_util.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
-#include "chrome/browser/chromeos/login/session_manager_observer.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
 #include "chrome/browser/chromeos/low_memory_observer.h"
@@ -290,9 +290,11 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
 
   chromeos::CrosDBusService::Initialize();
 
-  // 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);
+  // 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());
 
   chromeos::disks::DiskMountManager::Initialize();
   cryptohome::AsyncMethodCaller::Initialize();
@@ -344,7 +346,7 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
   chromeos::BootTimesLoader::Get()->RecordChromeMainStats();
 
   // Trigger prefetching of ownership status.
-  chromeos::OwnershipService::GetSharedInstance()->Prewarm();
+  chromeos::DeviceSettingsService::Get()->Load();
 
   // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
   // -- just before CreateProfile().
@@ -503,9 +505,11 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
   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();