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

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

Issue 420633002: [Sync] Cleanup datatype configuration error handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unready Created 6 years, 4 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 "base/file_util.h" 5 #include "base/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 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 TEST_F(ProfileSyncServiceStartupTest, StartFailure) { 501 TEST_F(ProfileSyncServiceStartupTest, StartFailure) {
502 profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, 502 profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
503 "test_user@gmail.com"); 503 "test_user@gmail.com");
504 SigninManagerFactory::GetForProfile(profile_) 504 SigninManagerFactory::GetForProfile(profile_)
505 ->SetAuthenticatedUsername("test_user@gmail.com"); 505 ->SetAuthenticatedUsername("test_user@gmail.com");
506 CreateSyncService(); 506 CreateSyncService();
507 sync_->SetSyncSetupCompleted(); 507 sync_->SetSyncSetupCompleted();
508 SetUpSyncBackendHost(); 508 SetUpSyncBackendHost();
509 DataTypeManagerMock* data_type_manager = SetUpDataTypeManager(); 509 DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
510 DataTypeManager::ConfigureStatus status = DataTypeManager::ABORTED; 510 DataTypeManager::ConfigureStatus status = DataTypeManager::ABORTED;
511 syncer::SyncError error(
512 FROM_HERE,
513 syncer::SyncError::DATATYPE_ERROR,
514 "Association failed.",
515 syncer::BOOKMARKS);
516 std::map<syncer::ModelType, syncer::SyncError> errors;
517 errors[syncer::BOOKMARKS] = error;
518 DataTypeManager::ConfigureResult result( 511 DataTypeManager::ConfigureResult result(
519 status, 512 status,
520 syncer::ModelTypeSet(),
521 errors,
522 syncer::ModelTypeSet(),
523 syncer::ModelTypeSet()); 513 syncer::ModelTypeSet());
524 EXPECT_CALL(*data_type_manager, Configure(_, _)). 514 EXPECT_CALL(*data_type_manager, Configure(_, _)).
525 WillRepeatedly( 515 WillRepeatedly(
526 DoAll(InvokeOnConfigureStart(sync_), 516 DoAll(InvokeOnConfigureStart(sync_),
527 InvokeOnConfigureDone(sync_, result))); 517 InvokeOnConfigureDone(sync_, result)));
528 EXPECT_CALL(*data_type_manager, state()). 518 EXPECT_CALL(*data_type_manager, state()).
529 WillOnce(Return(DataTypeManager::STOPPED)); 519 WillOnce(Return(DataTypeManager::STOPPED));
530 EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber()); 520 EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
531 IssueTestTokens(); 521 IssueTestTokens();
532 sync_->Initialize(); 522 sync_->Initialize();
(...skipping 13 matching lines...) Expand all
546 profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted); 536 profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted);
547 537
548 EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber()); 538 EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
549 sync_->Initialize(); 539 sync_->Initialize();
550 540
551 sync_->SetSetupInProgress(true); 541 sync_->SetSetupInProgress(true);
552 IssueTestTokens(); 542 IssueTestTokens();
553 sync_->SetSetupInProgress(false); 543 sync_->SetSetupInProgress(false);
554 EXPECT_FALSE(sync_->sync_initialized()); 544 EXPECT_FALSE(sync_->sync_initialized());
555 } 545 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698