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

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

Issue 15421011: Use OAuth2 token for sync (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix issues based on feedback Created 7 years, 6 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 <map> 5 #include <map>
6 #include <string> 6 #include <string>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 } 145 }
146 146
147 bool StartSyncService(const base::Closure& callback, 147 bool StartSyncService(const base::Closure& callback,
148 bool will_fail_association) { 148 bool will_fail_association) {
149 if (sync_service_) 149 if (sync_service_)
150 return false; 150 return false;
151 151
152 SigninManagerBase* signin = 152 SigninManagerBase* signin =
153 SigninManagerFactory::GetForProfile(profile_.get()); 153 SigninManagerFactory::GetForProfile(profile_.get());
154 signin->SetAuthenticatedUsername("test"); 154 signin->SetAuthenticatedUsername("test");
155 ProfileOAuth2TokenServiceFactory::GetInstance()->SetTestingFactory(
156 profile_.get(), FakeOAuth2TokenService::BuildTokenService);
155 sync_service_ = static_cast<TestProfileSyncService*>( 157 sync_service_ = static_cast<TestProfileSyncService*>(
156 ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse( 158 ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
157 profile_.get(), &TestProfileSyncService::BuildAutoStartAsyncInit)); 159 profile_.get(), &TestProfileSyncService::BuildAutoStartAsyncInit));
158 sync_service_->set_backend_init_callback(callback); 160 sync_service_->set_backend_init_callback(callback);
159 pref_sync_service_ = reinterpret_cast<PrefModelAssociator*>( 161 pref_sync_service_ = reinterpret_cast<PrefModelAssociator*>(
160 prefs_->GetSyncableService(syncer::PREFERENCES)); 162 prefs_->GetSyncableService(syncer::PREFERENCES));
161 if (!pref_sync_service_) 163 if (!pref_sync_service_)
162 return false; 164 return false;
163 ProfileSyncComponentsFactoryMock* components = 165 ProfileSyncComponentsFactoryMock* components =
164 sync_service_->components_factory_mock(); 166 sync_service_->components_factory_mock();
165 EXPECT_CALL(*components, GetSyncableServiceForType(syncer::PREFERENCES)). 167 EXPECT_CALL(*components, GetSyncableServiceForType(syncer::PREFERENCES)).
166 WillOnce(Return(pref_sync_service_->AsWeakPtr())); 168 WillOnce(Return(pref_sync_service_->AsWeakPtr()));
167 169
168 EXPECT_CALL(*components, CreateDataTypeManager(_, _, _, _, _)). 170 EXPECT_CALL(*components, CreateDataTypeManager(_, _, _, _, _)).
169 WillOnce(ReturnNewDataTypeManagerWithDebugListener( 171 WillOnce(ReturnNewDataTypeManagerWithDebugListener(
170 syncer::MakeWeakHandle(debug_ptr_factory_.GetWeakPtr()))); 172 syncer::MakeWeakHandle(debug_ptr_factory_.GetWeakPtr())));
171 dtc_ = new UIDataTypeController(syncer::PREFERENCES, 173 dtc_ = new UIDataTypeController(syncer::PREFERENCES,
172 components, 174 components,
173 profile_.get(), 175 profile_.get(),
174 sync_service_); 176 sync_service_);
175 EXPECT_CALL(*components, CreateSharedChangeProcessor()). 177 EXPECT_CALL(*components, CreateSharedChangeProcessor()).
176 WillOnce(Return(new SharedChangeProcessor())); 178 WillOnce(Return(new SharedChangeProcessor()));
177 EXPECT_CALL(*components, CreateGenericChangeProcessor(_, _, _, _)). 179 EXPECT_CALL(*components, CreateGenericChangeProcessor(_, _, _, _)).
178 WillOnce(CreateAndSaveChangeProcessor( 180 WillOnce(CreateAndSaveChangeProcessor(
179 &change_processor_)); 181 &change_processor_));
180 sync_service_->RegisterDataTypeController(dtc_); 182 sync_service_->RegisterDataTypeController(dtc_);
181 TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest( 183 TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
182 GaiaConstants::kSyncService, "token"); 184 GaiaConstants::kGaiaOAuth2LoginRefreshToken, "oauth2_login_token");
183 185
184 sync_service_->Initialize(); 186 sync_service_->Initialize();
185 base::MessageLoop::current()->Run(); 187 base::MessageLoop::current()->Run();
186 188
187 // It's possible this test triggered an unrecoverable error, in which case 189 // It's possible this test triggered an unrecoverable error, in which case
188 // we can't get the preference count. 190 // we can't get the preference count.
189 if (sync_service_->ShouldPushChanges()) { 191 if (sync_service_->ShouldPushChanges()) {
190 EXPECT_EQ(GetSyncPreferenceCount(), 192 EXPECT_EQ(GetSyncPreferenceCount(),
191 association_stats_.num_sync_items_after_association); 193 association_stats_.num_sync_items_after_association);
192 } 194 }
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 EXPECT_FALSE(pref->IsDefaultValue()); 678 EXPECT_FALSE(pref->IsDefaultValue());
677 // There should be no synced value. 679 // There should be no synced value.
678 EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL); 680 EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL);
679 // Switch kHomePage back to unmanaged. 681 // Switch kHomePage back to unmanaged.
680 profile_->GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage); 682 profile_->GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage);
681 // The original value should be picked up. 683 // The original value should be picked up.
682 EXPECT_TRUE(pref->IsDefaultValue()); 684 EXPECT_TRUE(pref->IsDefaultValue());
683 // There should still be no synced value. 685 // There should still be no synced value.
684 EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL); 686 EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL);
685 } 687 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698