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

Unified Diff: chrome/browser/signin/signin_manager_unittest.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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/signin/signin_manager_unittest.cc
diff --git a/chrome/browser/signin/signin_manager_unittest.cc b/chrome/browser/signin/signin_manager_unittest.cc
index 638d5316a1bc096ce3f78f3d52607a7083efc87c..cc8e974b6232994bd6454c396dda1ece10ffcbff 100644
--- a/chrome/browser/signin/signin_manager_unittest.cc
+++ b/chrome/browser/signin/signin_manager_unittest.cc
@@ -45,7 +45,7 @@ const char kGetTokenPairValidResponse[] =
class SigninManagerTest : public TokenServiceTestHarness {
public:
virtual void SetUp() OVERRIDE {
- prefs_.reset(new TestingPrefService);
+ prefs_.reset(new TestingPrefServiceSimple);
chrome::RegisterLocalState(prefs_.get());
static_cast<TestingBrowserProcess*>(g_browser_process)->SetLocalState(
prefs_.get());
@@ -187,7 +187,7 @@ class SigninManagerTest : public TokenServiceTestHarness {
scoped_ptr<SigninManager> manager_;
content::TestNotificationTracker google_login_success_;
content::TestNotificationTracker google_login_failure_;
- scoped_ptr<TestingPrefService> prefs_;
+ scoped_ptr<TestingPrefServiceSimple> prefs_;
};
// NOTE: ClientLogin's "StartSignin" is called after collecting credentials
« no previous file with comments | « chrome/browser/signin/signin_manager_factory.cc ('k') | chrome/browser/speech/chrome_speech_recognition_preferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698