Refactor the wait code in ProfileSyncServiceTestHarness.

chrome/test/live_sync/profile_sync_service_test_harness.cc

Index: chrome/test/live_sync/profile_sync_service_test_harness.cc
diff --git a/chrome/test/live_sync/profile_sync_service_test_harness.cc b/chrome/test/live_sync/profile_sync_service_test_harness.cc
index 6225cf0a9f99077d735801b918cd2cb40cb2b559..de928fc6ed3d4aeded8cdf9732f3ef9301ae8f0c 100644
--- a/chrome/test/live_sync/profile_sync_service_test_harness.cc
+++ b/chrome/test/live_sync/profile_sync_service_test_harness.cc
@@ -84,7 +84,7 @@ bool StateChangeTimeoutEvent::Abort() {
 
 ProfileSyncServiceTestHarness::ProfileSyncServiceTestHarness(
     Profile* p, const std::string& username, const std::string& password)
-    : wait_state_(WAITING_FOR_INITIAL_CALLBACK), profile_(p), service_(NULL),
+    : wait_state_(WAITING_FOR_ON_AUTH_ERROR), profile_(p), service_(NULL),
       last_status_(kInvalidStatus),
       last_timestamp_(0),
       min_timestamp_needed_(kMinTimestampNeededNone),
@@ -95,12 +95,15 @@ ProfileSyncServiceTestHarness::ProfileSyncServiceTestHarness(
 }
 
 bool ProfileSyncServiceTestHarness::SetupSync() {
-  service_ = profile_->GetProfileSyncService();
-  service_->SetSyncSetupCompleted();
-  service_->EnableForUser();
+  syncable::ModelTypeSet set;
+  for (int i = syncable::FIRST_REAL_MODEL_TYPE;
+      i < syncable::MODEL_TYPE_COUNT; ++i) {
+    set.insert(syncable::ModelTypeFromInt(i));
+  }
 
-  // Needed to avoid showing the login dialog. Well aware this is egregious.
-  service_->expecting_first_run_auth_needed_event_ = false;
+  service_ = profile_->GetProfileSyncService();
+  service_->StartUp();
+  service_->OnUserChoseDatatypes(true, set);
   service_->AddObserver(this);
   return WaitForServiceInit();
 }
@@ -120,14 +123,16 @@ bool ProfileSyncServiceTestHarness::RunStateChangeMachine() {
   WaitState state = wait_state_;
   ProfileSyncService::Status status(service_->QueryDetailedSyncStatus());
   switch (wait_state_) {
-    case WAITING_FOR_INITIAL_CALLBACK:
-      SignalStateCompleteWithNextState(WAITING_FOR_READY_TO_PROCESS_CHANGES);
+    case WAITING_FOR_ON_AUTH_ERROR: {
+      SignalStateCompleteWithNextState(WAITING_FOR_NOTIFICATIONS_ENABLED);
       break;
-    case WAITING_FOR_READY_TO_PROCESS_CHANGES:
-      if (service_->ShouldPushChanges()) {
-        SignalStateCompleteWithNextState(WAITING_FOR_NOTHING);
+    }
+    case WAITING_FOR_NOTIFICATIONS_ENABLED: {
+      if (status.notifications_enabled) {
+        SignalStateCompleteWithNextState(FULLY_SYNCED);
       }
       break;
+    }
     case WAITING_FOR_SYNC_TO_FINISH: {
       const SyncSessionSnapshot* snap =
           service_->backend()->GetLastSessionSnapshot();
@@ -137,7 +142,7 @@ bool ProfileSyncServiceTestHarness::RunStateChangeMachine() {
 
       EXPECT_LE(last_timestamp_, snap->max_local_timestamp);
       last_timestamp_ = snap->max_local_timestamp;
-      SignalStateCompleteWithNextState(WAITING_FOR_NOTHING);
+      SignalStateCompleteWithNextState(FULLY_SYNCED);
       break;
     }
     case WAITING_FOR_UPDATES: {
@@ -147,10 +152,10 @@ bool ProfileSyncServiceTestHarness::RunStateChangeMachine() {
       if (snap->max_local_timestamp < min_timestamp_needed_)
         break;
 
-      SignalStateCompleteWithNextState(WAITING_FOR_NOTHING);
+      SignalStateCompleteWithNextState(FULLY_SYNCED);
       break;
     }
-    case WAITING_FOR_NOTHING:
+    case FULLY_SYNCED:
     default:
       // Invalid state during observer callback which may be triggered by other
       // classes using the the UI message loop.  Defer to their handling.
@@ -203,17 +208,21 @@ bool ProfileSyncServiceTestHarness::AwaitStatusChangeWithTimeout(
 }
 
 bool ProfileSyncServiceTestHarness::WaitForServiceInit() {
-  // Wait for the initial (auth needed) callback.
-  EXPECT_EQ(wait_state_, WAITING_FOR_INITIAL_CALLBACK);
-  if (!AwaitStatusChangeWithTimeout(30, "Waiting for authwatcher calback.")) {
+  // Wait for the OnAuthError() callback.
+  EXPECT_EQ(wait_state_, WAITING_FOR_ON_AUTH_ERROR);
+  if (!AwaitStatusChangeWithTimeout(30,
+      "Waiting for the OnAuthError() callback.")) {
     return false;
   }
 
-  // Wait for the OnBackendInitialized callback.
+  // Enter GAIA credentials and wait for notifications_enabled to be set to
+  // true.
   service_->backend()->Authenticate(username_, password_, std::string());
-  EXPECT_EQ(wait_state_, WAITING_FOR_READY_TO_PROCESS_CHANGES);
-  if (!AwaitStatusChangeWithTimeout(30, "Waiting on backend initialization.")) {
+  EXPECT_EQ(wait_state_, WAITING_FOR_NOTIFICATIONS_ENABLED);
+  if (!AwaitStatusChangeWithTimeout(30,
+      "Waiting for notifications_enabled to be set to true.")) {
     return false;
   }
+
   return service_->sync_initialized();
 }