Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Unified Diff: chrome/test/base/testing_browser_process.cc

Issue 14200028: Make CrosSettings and DeviceSettingsService non Lazy instances (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/profile_manager_unittest.cc ('k') | chromeos/dbus/dbus_thread_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_browser_process.cc
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc
index d3d21f09c30e3d25c40cd5d6dc5bc00c7d50d59f..4bcfa277749a863585734c5567dd022e64fd2988 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -24,10 +24,6 @@
#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
@@ -380,13 +376,6 @@ void TestingBrowserProcess::SetBrowserPolicyConnector(
#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
« no previous file with comments | « chrome/browser/profiles/profile_manager_unittest.cc ('k') | chromeos/dbus/dbus_thread_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698