Enforce SavePersistentPrefs in RestartJob path.

chrome/browser/chromeos/cros/login_library.cc

 // Copyright (c) 2011 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/cros/login_library.h"
 
 #include "base/message_loop.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_type.h"
 
 namespace chromeos {
 
 class LoginLibraryImpl : public LoginLibrary {
  public:
   LoginLibraryImpl()
       : set_owner_key_callback_(NULL),
@@ skipping 102 matching lines @@
   bool StopSession(const std::string& unique_id /* unused */) {
     // only pass unique_id through once we use it for something.
     return chromeos::StopSession("");
   }
 
   bool RestartEntd() {
     return chromeos::RestartEntd();
   }
 
   bool RestartJob(int pid, const std::string& command_line) {
+    if (g_browser_process && g_browser_process->local_state()) {
+      // XXX: normally this call must not be needed, however it turned out that

[Nikita (slow), 2011/03/17 16:04:40]

Please comment in this one too
http://code.google.com/p/chromium-os/issues/detail?id=6924

+      // without this explicit call to SavePersistentPrefs it is possible for
+      // preferences to be lost. See http://crosbug.com/13102
+      g_browser_process->local_state()->SavePersistentPrefs();
+    }
     return chromeos::RestartJob(pid, command_line.c_str());
   }
 
  private:
   static void Handler(void* object, const OwnershipEvent& event) {
     LoginLibraryImpl* self = static_cast<LoginLibraryImpl*>(object);
     switch (event) {
       case SetKeySuccess:
         self->CompleteSetOwnerKey(true);
         break;
@@ skipping 128 matching lines @@
 
 // static
 LoginLibrary* LoginLibrary::GetImpl(bool stub) {
   if (stub)
     return new LoginLibraryStubImpl();
   else
     return new LoginLibraryImpl();
 }
 
 }  // namespace chromeos