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

Unified Diff: chrome/browser/ui/cocoa/options/preferences_window_controller_unittest.mm

Issue 6292017: Extended: Add "system" URLRequestContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup Created 9 years, 10 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
Index: chrome/browser/ui/cocoa/options/preferences_window_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/options/preferences_window_controller_unittest.mm b/chrome/browser/ui/cocoa/options/preferences_window_controller_unittest.mm
index 54110226f28e5791720861c02871ac3d6a336807..2ddc9c03bf01441ea9750d2886f890c1da1ce7c2 100644
--- a/chrome/browser/ui/cocoa/options/preferences_window_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/options/preferences_window_controller_unittest.mm
@@ -37,15 +37,14 @@ class PrefsControllerTest : public CocoaTest {
public:
virtual void SetUp() {
CocoaTest::SetUp();
- // The metrics reporting pref is registerd on the local state object in
- // real builds, but we don't have one of those for unit tests. Register
- // it on prefs so we'll find it when we go looking.
- PrefService* prefs = browser_helper_.profile()->GetPrefs();
+ PrefService* prefs = browser_helper_.profile()->GetLocalState();
prefs->RegisterBooleanPref(prefs::kMetricsReportingEnabled, false);
- pref_controller_ = [[PreferencesWindowController alloc]
- initWithProfile:browser_helper_.profile()
- initialPage:OPTIONS_PAGE_DEFAULT];
+ pref_controller_ =
+ [[PreferencesWindowController alloc]
+ initWithProfile:browser_helper_.profile()
+ localState:browser_helper_.profile()->GetLocalState()
+ initialPage:OPTIONS_PAGE_DEFAULT];
EXPECT_TRUE(pref_controller_);
}

Powered by Google App Engine
This is Rietveld 408576698