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

Side by Side Diff: chrome/browser/signin/signin_manager_unittest.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again; base::File changes conflicted. Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/signin/signin_manager.h" 5 #include "chrome/browser/signin/signin_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 // thread, if it does not already exist. But it must be created on the IO 58 // thread, if it does not already exist. But it must be created on the IO
59 // thread or else it will DCHECK upon destruction. 59 // thread or else it will DCHECK upon destruction.
60 // Force it to be created here. 60 // Force it to be created here.
61 profile_->CreateRequestContext(); 61 profile_->CreateRequestContext();
62 profile_->GetRequestContext()->GetURLRequestContext(); 62 profile_->GetRequestContext()->GetURLRequestContext();
63 io_setup_complete->Signal(); 63 io_setup_complete->Signal();
64 } 64 }
65 65
66 virtual void SetUp() OVERRIDE { 66 virtual void SetUp() OVERRIDE {
67 prefs_.reset(new TestingPrefServiceSimple); 67 prefs_.reset(new TestingPrefServiceSimple);
68 chrome::RegisterLocalState(prefs_->registry(), prefs_.get()); 68 chrome::RegisterLocalState(prefs_.get(), prefs_->registry());
69 TestingBrowserProcess::GetGlobal()->SetLocalState( 69 TestingBrowserProcess::GetGlobal()->SetLocalState(
70 prefs_.get()); 70 prefs_.get());
71 TokenServiceTestHarness::SetUp(); 71 TokenServiceTestHarness::SetUp();
72 manager_.reset(new SigninManager()); 72 manager_.reset(new SigninManager());
73 google_login_success_.ListenFor( 73 google_login_success_.ListenFor(
74 chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL, 74 chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
75 content::Source<Profile>(profile_.get())); 75 content::Source<Profile>(profile_.get()));
76 google_login_failure_.ListenFor(chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED, 76 google_login_failure_.ListenFor(chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED,
77 content::Source<Profile>(profile_.get())); 77 content::Source<Profile>(profile_.get()));
78 78
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 647
648 manager_->ProvideOAuthChallengeResponse( 648 manager_->ProvideOAuthChallengeResponse(
649 GoogleServiceAuthError::CAPTCHA_REQUIRED, "token", "solution"); 649 GoogleServiceAuthError::CAPTCHA_REQUIRED, "token", "solution");
650 650
651 SimulateProvideOAuthChallengeResponseValid(); 651 SimulateProvideOAuthChallengeResponseValid();
652 EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername()); 652 EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
653 653
654 EXPECT_EQ(1U, google_login_success_.size()); 654 EXPECT_EQ(1U, google_login_success_.size());
655 EXPECT_EQ(1U, google_login_failure_.size()); 655 EXPECT_EQ(1U, google_login_failure_.size());
656 } 656 }
OLDNEW
« 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