Initialize CrosSettings before SetupMetrics

chrome/browser/browser_process_impl.cc

Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 365f662b1fefa8fc24d635dfa5e28761f6bc78d0..f23eced67b9c39cb3357f70914b259eb3e5da4af 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -116,7 +116,6 @@
 
 #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)
@@ -205,11 +204,6 @@ 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() {
@@ -858,9 +852,6 @@ void BrowserProcessImpl::CreateLocalState() {
 }
 
 void BrowserProcessImpl::PreCreateThreads() {
-#if defined(OS_CHROMEOS)
-  chromeos::CrosSettings::Initialize();
-#endif
   io_thread_.reset(new IOThread(local_state(), policy_service(), net_log_.get(),
                                 extension_event_router_forwarder_.get()));
 }