Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/test/base/testing_browser_process.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/test/base/testing_browser_process.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/string_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if !defined(OS_IOS)
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/prerender/prerender_tracker.h"
 #include "chrome/browser/printing/background_printing_manager.h"
 #include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/thumbnails/render_widget_snapshot_taker.h"
 #endif
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/settings/device_settings_service.h"
-#endif
-
 #if defined(ENABLE_CONFIGURATION_POLICY)
 #include "chrome/browser/policy/browser_policy_connector.h"
 #else
 #include "chrome/browser/policy/policy_service_stub.h"
 #endif  // defined(ENABLE_CONFIGURATION_POLICY)
 
 #if defined(ENABLE_MESSAGE_CENTER)
 #include "ui/message_center/message_center.h"
 #endif
 
@@ skipping 332 matching lines @@
 
 void TestingBrowserProcess::SetIOThread(IOThread* io_thread) {
   io_thread_ = io_thread;
 }
 
 void TestingBrowserProcess::SetBrowserPolicyConnector(
     policy::BrowserPolicyConnector* connector) {
 #if defined(ENABLE_CONFIGURATION_POLICY)
   if (browser_policy_connector_) {
     browser_policy_connector_->Shutdown();
-#if defined(OS_CHROMEOS)
-    if (!connector) {
-      // If the connector was created then it accessed this global singleton.
-      // It must also be Shutdown() for a clean teardown.
-      chromeos::DeviceSettingsService::Get()->Shutdown();
-    }
-#endif
   }
   browser_policy_connector_.reset(connector);
 #else
   CHECK(false);
 #endif
 }
 
 void TestingBrowserProcess::SetSafeBrowsingService(
     SafeBrowsingService* sb_service) {
 #if !defined(OS_IOS)
   NOTIMPLEMENTED();
   sb_service_ = sb_service;
 #endif
 }