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

Unified Diff: chrome/browser/sync/sync_startup_tracker_unittest.cc

Issue 2551023006: [Sync] SyncEngine 1.5: Fix all backend references in PSS. (Closed)
Patch Set: Fix Android. Created 4 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/sync_startup_tracker_unittest.cc
diff --git a/chrome/browser/sync/sync_startup_tracker_unittest.cc b/chrome/browser/sync/sync_startup_tracker_unittest.cc
index 069634aaa1087b6ea4025c1f9bcf4cc5463c68b1..6faa4c9ac9a1678b109cdc60c587436dec431da0 100644
--- a/chrome/browser/sync/sync_startup_tracker_unittest.cc
+++ b/chrome/browser/sync/sync_startup_tracker_unittest.cc
@@ -55,7 +55,7 @@ class SyncStartupTrackerTest : public testing::Test {
void SetupNonInitializedPSS() {
EXPECT_CALL(*mock_pss_, GetAuthError())
.WillRepeatedly(ReturnRef(no_error_));
- EXPECT_CALL(*mock_pss_, IsBackendInitialized())
+ EXPECT_CALL(*mock_pss_, IsEngineInitialized())
.WillRepeatedly(Return(false));
EXPECT_CALL(*mock_pss_, HasUnrecoverableError())
.WillRepeatedly(Return(false));
@@ -70,7 +70,7 @@ class SyncStartupTrackerTest : public testing::Test {
};
TEST_F(SyncStartupTrackerTest, SyncAlreadyInitialized) {
- EXPECT_CALL(*mock_pss_, IsBackendInitialized()).WillRepeatedly(Return(true));
+ EXPECT_CALL(*mock_pss_, IsEngineInitialized()).WillRepeatedly(Return(true));
EXPECT_CALL(*mock_pss_, CanSyncStart()).WillRepeatedly(Return(true));
EXPECT_CALL(observer_, SyncStartupCompleted());
SyncStartupTracker tracker(profile_.get(), &observer_);
@@ -79,7 +79,7 @@ TEST_F(SyncStartupTrackerTest, SyncAlreadyInitialized) {
TEST_F(SyncStartupTrackerTest, SyncNotSignedIn) {
// Make sure that we get a SyncStartupFailed() callback if sync is not logged
// in.
- EXPECT_CALL(*mock_pss_, IsBackendInitialized()).WillRepeatedly(Return(false));
+ EXPECT_CALL(*mock_pss_, IsEngineInitialized()).WillRepeatedly(Return(false));
EXPECT_CALL(*mock_pss_, CanSyncStart()).WillRepeatedly(Return(false));
EXPECT_CALL(observer_, SyncStartupFailed());
SyncStartupTracker tracker(profile_.get(), &observer_);
@@ -88,7 +88,7 @@ TEST_F(SyncStartupTrackerTest, SyncNotSignedIn) {
TEST_F(SyncStartupTrackerTest, SyncAuthError) {
// Make sure that we get a SyncStartupFailed() callback if sync gets an auth
// error.
- EXPECT_CALL(*mock_pss_, IsBackendInitialized()).WillRepeatedly(Return(false));
+ EXPECT_CALL(*mock_pss_, IsEngineInitialized()).WillRepeatedly(Return(false));
EXPECT_CALL(*mock_pss_, CanSyncStart()).WillRepeatedly(Return(true));
GoogleServiceAuthError error(
GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS);
@@ -105,7 +105,7 @@ TEST_F(SyncStartupTrackerTest, SyncDelayedInitialization) {
SyncStartupTracker tracker(profile_.get(), &observer_);
Mock::VerifyAndClearExpectations(&observer_);
// Now, mark the PSS as initialized.
- EXPECT_CALL(*mock_pss_, IsBackendInitialized()).WillRepeatedly(Return(true));
+ EXPECT_CALL(*mock_pss_, IsEngineInitialized()).WillRepeatedly(Return(true));
EXPECT_CALL(observer_, SyncStartupCompleted());
tracker.OnStateChanged();
}
@@ -120,7 +120,7 @@ TEST_F(SyncStartupTrackerTest, SyncDelayedAuthError) {
Mock::VerifyAndClearExpectations(mock_pss_);
// Now, mark the PSS as having an auth error.
- EXPECT_CALL(*mock_pss_, IsBackendInitialized()).WillRepeatedly(Return(false));
+ EXPECT_CALL(*mock_pss_, IsEngineInitialized()).WillRepeatedly(Return(false));
EXPECT_CALL(*mock_pss_, CanSyncStart()).WillRepeatedly(Return(true));
GoogleServiceAuthError error(
GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS);
@@ -139,7 +139,7 @@ TEST_F(SyncStartupTrackerTest, SyncDelayedUnrecoverableError) {
Mock::VerifyAndClearExpectations(mock_pss_);
// Now, mark the PSS as having an unrecoverable error.
- EXPECT_CALL(*mock_pss_, IsBackendInitialized()).WillRepeatedly(Return(false));
+ EXPECT_CALL(*mock_pss_, IsEngineInitialized()).WillRepeatedly(Return(false));
EXPECT_CALL(*mock_pss_, CanSyncStart()).WillRepeatedly(Return(true));
GoogleServiceAuthError error(
GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS);
« no previous file with comments | « chrome/browser/sync/sync_startup_tracker.cc ('k') | chrome/browser/sync/test/integration/profile_sync_service_harness.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698