Refactor the wait code in ProfileSyncServiceTestHarness.

chrome/test/live_sync/profile_sync_service_test_harness.h

-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_TEST_LIVE_SYNC_PROFILE_SYNC_SERVICE_TEST_HARNESS_H_
 #define CHROME_TEST_LIVE_SYNC_PROFILE_SYNC_SERVICE_TEST_HARNESS_H_
 
 #include <string>
 
 #include "base/time.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ skipping 35 matching lines @@
 
   ProfileSyncService* service() { return service_; }
 
   // See ProfileSyncService::ShouldPushChanges().
   bool ServiceIsPushingChanges() { return service_->ShouldPushChanges(); }
 
  private:
   friend class StateChangeTimeoutEvent;
 
   enum WaitState {
-    WAITING_FOR_INITIAL_CALLBACK = 0,
-    WAITING_FOR_READY_TO_PROCESS_CHANGES,
+    // The sync client awaits the OnAuthError() callback.
+    WAITING_FOR_ON_AUTH_ERROR = 0,
+    // The sync client is waiting for notifications_enabled to become true.
+    WAITING_FOR_NOTIFICATIONS_ENABLED,
+    // The sync client is waiting for an ongoing sync cycle to complete.
     WAITING_FOR_SYNC_TO_FINISH,
+    // The sync client anticipates incoming updates leading to a new sync cycle.
     WAITING_FOR_UPDATES,
-    WAITING_FOR_NOTHING,
+    // The sync client is fully synced and there are no pending updates.
+    FULLY_SYNCED,
     NUMBER_OF_STATES
   };
 
   // Called from the observer when the current wait state has been completed.
   void SignalStateCompleteWithNextState(WaitState next_state);
   void SignalStateComplete();
 
   // Finite state machine for controlling state.  Returns true only if a state
   // change has taken place.
   bool RunStateChangeMachine();
@@ skipping 24 matching lines @@
   int64 min_timestamp_needed_;
 
   // Credentials used for GAIA authentication.
   std::string username_;
   std::string password_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceTestHarness);
 };
 
 #endif  // CHROME_TEST_LIVE_SYNC_PROFILE_SYNC_SERVICE_TEST_HARNESS_H_