chrome/browser/profiles/profile_manager_unittest.cc - Issue 14200028: Make CrosSettings and DeviceSettingsService non Lazy instances

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/profiles/profile_manager_unittest.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:

Index: chrome/browser/profiles/profile_manager_unittest.cc

diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc

index 8df5a4999f6a4ef7fa71da98cb95b04b596d33f8..7628a3a5e3a7e4f9984ad38fd4ec3762cec5893a 100644

--- a/chrome/browser/profiles/profile_manager_unittest.cc

+++ b/chrome/browser/profiles/profile_manager_unittest.cc

@@ -14,6 +14,7 @@

#include "build/build_config.h"

#include "chrome/browser/bookmarks/bookmark_model_factory.h"

#include "chrome/browser/browser_process.h"

+#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/extensions/event_router_forwarder.h"

#include "chrome/browser/history/history_service.h"

#include "chrome/browser/history/history_service_factory.h"

@@ -124,6 +125,7 @@ class ProfileManagerTest : public testing::Test {

// before io_thread_ which requires CrosLibrary to be initialized to construct

// its data member pref_proxy_config_tracker_ on ChromeOS.

chromeos::ScopedStubCrosEnabler stub_cros_enabler_;

+ chromeos::ScopedTestCrosSettings test_cros_settings_;

#endif

// The path to temporary directory used to contain the test operations.