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

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

Issue 8515030: Do not clear tokens from db when the user enters new credentials. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: For review. Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/sync/signin_manager.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/sync/signin_manager.h" 5 #include "chrome/browser/sync/signin_manager.h"
6 6
7 #include "base/test/signaling_task.h" 7 #include "base/test/signaling_task.h"
8 #include "chrome/browser/net/gaia/token_service.h" 8 #include "chrome/browser/net/gaia/token_service.h"
9 #include "chrome/browser/net/gaia/token_service_unittest.h" 9 #include "chrome/browser/net/gaia/token_service_unittest.h"
10 #include "chrome/browser/password_manager/encryptor.h" 10 #include "chrome/browser/password_manager/encryptor.h"
11 #include "chrome/browser/prefs/pref_service.h"
11 #include "chrome/browser/sync/util/oauth.h" 12 #include "chrome/browser/sync/util/oauth.h"
12 #include "chrome/browser/webdata/web_data_service.h" 13 #include "chrome/browser/webdata/web_data_service.h"
13 #include "chrome/common/chrome_notification_types.h" 14 #include "chrome/common/chrome_notification_types.h"
14 #include "chrome/common/net/gaia/gaia_urls.h" 15 #include "chrome/common/net/gaia/gaia_urls.h"
16 #include "chrome/common/pref_names.h"
15 #include "chrome/test/base/testing_profile.h" 17 #include "chrome/test/base/testing_profile.h"
16 #include "content/test/test_url_fetcher_factory.h" 18 #include "content/test/test_url_fetcher_factory.h"
17 #include "net/url_request/url_request.h" 19 #include "net/url_request/url_request.h"
18 #include "net/url_request/url_request_status.h" 20 #include "net/url_request/url_request_status.h"
19 21
20 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
21 23
22 class SigninManagerTest : public TokenServiceTestHarness { 24 class SigninManagerTest : public TokenServiceTestHarness {
23 public: 25 public:
24 virtual void SetUp() OVERRIDE { 26 virtual void SetUp() OVERRIDE {
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 // Should go into token service and stop. 107 // Should go into token service and stop.
106 EXPECT_EQ(1U, google_login_success_.size()); 108 EXPECT_EQ(1U, google_login_success_.size());
107 EXPECT_EQ(0U, google_login_failure_.size()); 109 EXPECT_EQ(0U, google_login_failure_.size());
108 110
109 // Should persist across resets. 111 // Should persist across resets.
110 manager_.reset(new SigninManager()); 112 manager_.reset(new SigninManager());
111 manager_->Initialize(profile_.get()); 113 manager_->Initialize(profile_.get());
112 EXPECT_EQ("user@gmail.com", manager_->GetUsername()); 114 EXPECT_EQ("user@gmail.com", manager_->GetUsername());
113 } 115 }
114 116
117 TEST_F(SigninManagerTest, ClearInMemoryData) {
118 browser_sync::SetIsUsingOAuthForTest(false);
119 manager_->Initialize(profile_.get());
120 EXPECT_TRUE(manager_->GetUsername().empty());
121
122 manager_->StartSignIn("username", "password", "", "");
123 EXPECT_FALSE(manager_->GetUsername().empty());
124
125 SimulateValidResponseClientLogin();
126
127 // Should go into token service and stop.
128 EXPECT_EQ(1U, google_login_success_.size());
129 EXPECT_EQ(0U, google_login_failure_.size());
130
131 EXPECT_EQ("user@gmail.com", manager_->GetUsername());
132
133 // Now clear the in memory data.
134 manager_->ClearInMemoryData();
135 EXPECT_TRUE(manager_->GetUsername().empty());
136
137 // Ensure preferences are not modified.
138 EXPECT_FALSE(
139 profile_->GetPrefs()->GetString(prefs::kGoogleServicesUsername).empty());
140
141 // On reset it should be regenerated.
142 manager_.reset(new SigninManager());
143 manager_->Initialize(profile_.get());
144
145 // Now make sure we have the right user name.
146 EXPECT_EQ("user@gmail.com", manager_->GetUsername());
147 }
148
149
115 // NOTE: OAuth's "StartOAuthSignIn" is called before collecting credentials 150 // NOTE: OAuth's "StartOAuthSignIn" is called before collecting credentials
116 // from the user. See also SigninManagerTest::SignInClientLogin. 151 // from the user. See also SigninManagerTest::SignInClientLogin.
117 TEST_F(SigninManagerTest, SignInOAuth) { 152 TEST_F(SigninManagerTest, SignInOAuth) {
118 browser_sync::SetIsUsingOAuthForTest(true); 153 browser_sync::SetIsUsingOAuthForTest(true);
119 manager_->Initialize(profile_.get()); 154 manager_->Initialize(profile_.get());
120 EXPECT_TRUE(manager_->GetUsername().empty()); 155 EXPECT_TRUE(manager_->GetUsername().empty());
121 156
122 SimulateValidSigninOAuth(); 157 SimulateValidSigninOAuth();
123 EXPECT_FALSE(manager_->GetUsername().empty()); 158 EXPECT_FALSE(manager_->GetUsername().empty());
124 159
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 TEST_F(SigninManagerTest, SignOutOnUserInfoSucessRaceTest) { 281 TEST_F(SigninManagerTest, SignOutOnUserInfoSucessRaceTest) {
247 browser_sync::SetIsUsingOAuthForTest(true); 282 browser_sync::SetIsUsingOAuthForTest(true);
248 manager_->Initialize(profile_.get()); 283 manager_->Initialize(profile_.get());
249 EXPECT_TRUE(manager_->GetUsername().empty()); 284 EXPECT_TRUE(manager_->GetUsername().empty());
250 285
251 SimulateSigninStartOAuth(); 286 SimulateSigninStartOAuth();
252 manager_->SignOut(); 287 manager_->SignOut();
253 SimulateOAuthUserInfoSuccess(); 288 SimulateOAuthUserInfoSuccess();
254 EXPECT_TRUE(manager_->GetUsername().empty()); 289 EXPECT_TRUE(manager_->GetUsername().empty());
255 } 290 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/signin_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698