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

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

Issue 502343002: Add account_id to signin manager notifications. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@isauth
Patch Set: Fix android trybots Created 6 years, 3 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
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 "base/files/file_util.h" 5 #include "base/files/file_util.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/prefs/pref_service_syncable.h" 9 #include "chrome/browser/prefs/pref_service_syncable.h"
10 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" 10 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 } 159 }
160 160
161 protected: 161 protected:
162 void SimulateTestUserSignin() { 162 void SimulateTestUserSignin() {
163 profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, 163 profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
164 "test_user@gmail.com"); 164 "test_user@gmail.com");
165 #if !defined(OS_CHROMEOS) 165 #if !defined(OS_CHROMEOS)
166 fake_signin()->SignIn("test_user@gmail.com", ""); 166 fake_signin()->SignIn("test_user@gmail.com", "");
167 #else 167 #else
168 fake_signin()->SetAuthenticatedUsername("test_user@gmail.com"); 168 fake_signin()->SetAuthenticatedUsername("test_user@gmail.com");
169 sync_->GoogleSigninSucceeded("test_user@gmail.com", ""); 169 sync_->GoogleSigninSucceeded("test_user@gmail.com",
170 "test_user@gmail.com",
171 "");
170 #endif 172 #endif
171 } 173 }
172 174
173 DataTypeManagerMock* SetUpDataTypeManager() { 175 DataTypeManagerMock* SetUpDataTypeManager() {
174 DataTypeManagerMock* data_type_manager = new DataTypeManagerMock(); 176 DataTypeManagerMock* data_type_manager = new DataTypeManagerMock();
175 EXPECT_CALL(*components_factory_mock(), 177 EXPECT_CALL(*components_factory_mock(),
176 CreateDataTypeManager(_, _, _, _, _, _)). 178 CreateDataTypeManager(_, _, _, _, _, _)).
177 WillOnce(DoAll(SaveArg<5>(&data_type_status_table_), 179 WillOnce(DoAll(SaveArg<5>(&data_type_status_table_),
178 Return(data_type_manager))); 180 Return(data_type_manager)));
179 return data_type_manager; 181 return data_type_manager;
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted); 574 profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted);
573 575
574 EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber()); 576 EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
575 sync_->Initialize(); 577 sync_->Initialize();
576 578
577 sync_->SetSetupInProgress(true); 579 sync_->SetSetupInProgress(true);
578 IssueTestTokens(); 580 IssueTestTokens();
579 sync_->SetSetupInProgress(false); 581 sync_->SetSetupInProgress(false);
580 EXPECT_FALSE(sync_->sync_initialized()); 582 EXPECT_FALSE(sync_->sync_initialized());
581 } 583 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/sync/test/integration/profile_sync_service_harness.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698