New authorization framework for sync. ...

chrome/test/live_sync/profile_sync_service_test_harness.h

Index: chrome/test/live_sync/profile_sync_service_test_harness.h
===================================================================
--- chrome/test/live_sync/profile_sync_service_test_harness.h	(revision 58702)
+++ chrome/test/live_sync/profile_sync_service_test_harness.h	(working copy)
@@ -31,10 +31,6 @@
   // authenticated, and we are ready to process changes.
   bool SetupSync();
 
-  // Retries a sync setup when the previous attempt was aborted by an
-  // authentication failure.
-  bool RetryAuthentication();
-
   // ProfileSyncServiceObserver implementation.
   virtual void OnStateChanged();
 
@@ -79,16 +75,16 @@
   friend class StateChangeTimeoutEvent;
 
   enum WaitState {
-    // The sync client awaits the OnAuthError() callback.
-    WAITING_FOR_ON_AUTH_ERROR = 0,
     // The sync client awaits the OnBackendInitialized() callback.
-    WAITING_FOR_ON_BACKEND_INITIALIZED,
+    WAITING_FOR_ON_BACKEND_INITIALIZED = 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,
+    // The sync client is waiting for server_reachable to become true.
+    WAITING_FOR_SERVER_REACHABLE,
     // The sync client is fully synced and there are no pending updates.
     FULLY_SYNCED,
     // An authentication error has occurred.
@@ -110,7 +106,7 @@
 
   // Returns true if the service initialized correctly. Set is_auth_retry to
   // true when calling this method second time after an authentication failure.
-  bool WaitForServiceInit(bool is_auth_retry);
+  bool WaitForServiceInit();
 
   // Logs message with relevant info about client's sync state (if available).
   void LogClientInfo(std::string message);