Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2013 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/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/shell.h"
@@ skipping 308 matching lines @@
     // detector starts to monitor changes from the update engine.
     UpgradeDetectorChromeos::GetInstance()->Init();
 
     if (base::chromeos::IsRunningOnChromeOS()) {
       // Disable Num Lock on X start up for http://crosbug.com/29169.
       input_method::GetInputMethodManager()->GetXKeyboard()->
           SetNumLockEnabled(false);
     }
 
     // Initialize the device settings service so that we'll take actions per
-    // signals sent from the session manager.
-    DeviceSettingsService::Get()->Initialize(
+    // signals sent from the session manager. This needs to happen before
+    // g_browser_process initializes BrowserPolicyConnector.
+    DeviceSettingsService::Initialize();
+    DeviceSettingsService::Get()->SetSessionManager(
         DBusThreadManager::Get()->GetSessionManagerClient(),
         OwnerKeyUtil::Create());
     chromeos::ConnectivityStateHelper::Initialize();
   }
 
   ~DBusServices() {
     chromeos::ConnectivityStateHelper::Shutdown();
     // CrosLibrary is shut down before DBusThreadManager even though it
     // is initialized first becuase some of its libraries depend on DBus
     // clients.
@@ skipping 390 matching lines @@
   // the network manager.
   if (CrosNetworkChangeNotifierFactory::GetInstance())
     CrosNetworkChangeNotifierFactory::GetInstance()->Shutdown();
   if (NetworkChangeNotifierFactoryChromeos::GetInstance())
     NetworkChangeNotifierFactoryChromeos::GetInstance()->Shutdown();
 
   NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance();
   if (NetworkPortalDetector::IsEnabledInCommandLine() && detector)
     detector->Shutdown();
 
-  // Tell DeviceSettingsService to stop talking to session_manager.
-  DeviceSettingsService::Get()->Shutdown();
+  // Tell DeviceSettingsService to stop talking to session_manager. Do not
+  // shutdown DeviceSettingsService yet, it might still be accessed by
+  // BrowserPolicyConnector (owned by g_browser_process).
+  DeviceSettingsService::Get()->UnsetSessionManager();
 
   // We should remove observers attached to D-Bus clients before
   // DBusThreadManager is shut down.
   screen_lock_observer_.reset();
   suspend_observer_.reset();
   resume_observer_.reset();
   brightness_observer_.reset();
   retail_mode_power_save_blocker_.reset();
   peripheral_battery_observer_.reset();
 
@@ skipping 33 matching lines @@
   // Let the AutomaticRebootManager unregister itself as an observer of several
   // subsystems.
   automatic_reboot_manager_.reset();
 
   // Clean up dependency on CrosSettings and stop pending data fetches.
   KioskAppManager::Shutdown();
 
   ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
 }
 
+void ChromeBrowserMainPartsChromeos::PostDestroyThreads() {
+  ChromeBrowserMainPartsLinux::PostDestroyThreads();
+  // Destroy DeviceSettingsService after g_browser_process.
+  DeviceSettingsService::Shutdown();
+}
+
 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() {
   SetupZramFieldTrial();
 }
 
 void ChromeBrowserMainPartsChromeos::SetupZramFieldTrial() {
   // The dice for this experiment have been thrown at boot.  The selected group
   // number is stored in a file.
   const base::FilePath kZramGroupPath("/home/chronos/.swap_exp_enrolled");
   std::string zram_file_content;
   // If the file does not exist, the experiment has not started.
@@ skipping 29 matching lines @@
   trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
   trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
   trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
   trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
   trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
   // This is necessary to start the experiment as a side effect.
   trial->group();
 }
 
 }  //  namespace chromeos