Revert 154457 - Switch from SignedSettings to DeviceSettingsService.

chrome/browser/chromeos/settings/session_manager_observer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/settings/session_manager_observer.h"
 
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/settings/device_settings_cache.h"
 #include "chrome/browser/chromeos/settings/signed_settings.h"
+#include "chrome/browser/chromeos/settings/signed_settings_cache.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
 namespace chromeos {
 
 namespace {
 
 class StubDelegate
@@ skipping 33 matching lines @@
   VLOG(1) << "Owner key generation: " << (success ? "success" : "fail");
   int result =
       chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED;
   if (!success)
     result = chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_FAILED;
 
   // We stored some settings in transient storage before owner was assigned.
   // Now owner is assigned and key is generated and we should persist
   // those settings into signed storage.
   if (success && g_browser_process && g_browser_process->local_state())
-    device_settings_cache::Finalize(g_browser_process->local_state());
+    signed_settings_cache::Finalize(g_browser_process->local_state());
 
   // Whether we exported the public key or not, send a notification
   // indicating that we're done with this attempt.
   content::NotificationService::current()->Notify(
       result,
       content::NotificationService::AllSources(),
       content::NotificationService::NoDetails());
 }
 
 void SessionManagerObserver::PropertyChangeComplete(bool success) {
   if (success) {
     StubDelegate* stub = new StubDelegate();  // Manages its own lifetime.
     stub->set_fetcher(SignedSettings::CreateRetrievePolicyOp(stub));
     stub->fetcher()->Execute();
   }
 }
 
 }  // namespace chromeos