Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/browser_process_impl.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/browser_process_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 98 matching lines @@
 #elif defined(OS_MACOSX)
 #include "chrome/browser/chrome_browser_main_mac.h"
 #endif
 
 #if defined(USE_AURA)
 #include "ui/aura/env.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
+#include "chrome/browser/chromeos/settings/cros_settings.h"
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 #include "chrome/browser/plugins/plugins_resource_service.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "apps/app_shim/app_shim_host_manager_mac.h"
 #endif
 
@@ skipping 68 matching lines @@
 
 #if defined(ENABLE_MESSAGE_CENTER)
   message_center::MessageCenter::Initialize();
 #endif
 }
 
 BrowserProcessImpl::~BrowserProcessImpl() {
   tracked_objects::ThreadData::EnsureCleanupWasCalled(4);
 
   g_browser_process = NULL;
+
+#if defined(OS_CHROMEOS)
+  // Initialized in PreCreateThreards()
+  chromeos::CrosSettings::Shutdown();
+#endif
 }
 
 void BrowserProcessImpl::StartTearDown() {
 #if defined(ENABLE_AUTOMATION)
   // Delete the AutomationProviderList before NotificationService,
   // since it may try to unregister notifications
   // Both NotificationService and AutomationProvider are singleton instances in
   // the BrowserProcess. Since AutomationProvider may have some active
   // notification observers, it is essential that it gets destroyed before the
   // NotificationService. NotificationService won't be destroyed until after
@@ skipping 628 matching lines @@
                    net::HttpNetworkSession::NORMAL_SOCKET_POOL)));
 
   pref_change_registrar_.Add(
       prefs::kDisabledSchemes,
       base::Bind(&BrowserProcessImpl::ApplyDisabledSchemesPolicy,
                  base::Unretained(this)));
   ApplyDisabledSchemesPolicy();
 }
 
 void BrowserProcessImpl::PreCreateThreads() {
+#if defined(OS_CHROMEOS)
+  chromeos::CrosSettings::Initialize();

[Mattias Nissler (ping if slow), 2013/04/16 16:09:51]

Why is this not in chrome_browser_main_chromeos.cc?

[stevenjb, 2013/04/16 16:49:43]

new BrowserProcessImpl() and browser_process_->PreCreateThreads() are both
called in ChromeBrowserMainParts::PreCreateThreadsImpl()

CrosSettings has to be created after g_browser_process because constructing it
references g_browser_process as follows:

CrosSettings::CrosSettings() ->
DeviceSettingsProvider::DeviceSettingsProvider() ->
DeviceSettingsProvider::RetrieveCachedData()

I could put this into ChromeBrowserMainParts::PreCreateThreadsImpl() instead if
that seems better? I suppose I *could* subdivide PreCreateThreads into two
phases, but I'd prefer to avoid combining that level of re-factoring with this.

[Mattias Nissler (ping if slow), 2013/04/16 18:04:13]

Right, and IOThread initialization below immediately makes the first call to
CrosSettings, so we can't move it later in the init sequence either. Hrmpf,
don't know a better solution then without going down more rabbit holes.

+#endif
   io_thread_.reset(new IOThread(local_state(), policy_service(), net_log_.get(),
                                 extension_event_router_forwarder_.get()));
 }
 
 void BrowserProcessImpl::PreMainMessageLoopRun() {
 #if defined(ENABLE_CONFIGURATION_POLICY)
   // browser_policy_connector() is created very early because local_state()
   // needs policy to be initialized with the managed preference values.
   // However, policy fetches from the network and loading of disk caches
   // requires that threads are running; this Init() call lets the connector
@@ skipping 186 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartBackgroundInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)