New authorization framework for sync. ...

chrome/test/live_sync/profile_sync_service_test_harness.h

 // 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_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 13 matching lines @@
 class ProfileSyncServiceTestHarness : public ProfileSyncServiceObserver {
  public:
   ProfileSyncServiceTestHarness(Profile* p, const std::string& username,
                                 const std::string& password, int id);
 
   // Creates a ProfileSyncService for the profile passed at construction and
   // enables sync.  Returns true only after sync has been fully initialized and
   // 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();
 
   // Blocks the caller until this harness has completed a single sync cycle
   // since the previous one.  Returns true if a sync cycle has completed.
   bool AwaitSyncCycleCompletion(const std::string& reason);
 
   // Blocks the caller until this harness has observed that the sync engine
   // has "synced" up to at least the specified local timestamp.
   bool WaitUntilTimestampIsAtLeast(int64 timestamp, const std::string& reason);
@@ skipping 24 matching lines @@
 
   ProfileSyncService* service() { return service_; }
 
   // See ProfileSyncService::ShouldPushChanges().
   bool ServiceIsPushingChanges() { return service_->ShouldPushChanges(); }
 
  private:
   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.
     AUTH_ERROR,
     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();
 
   // Returns true if a status change took place, false on timeout.
   virtual bool AwaitStatusChangeWithTimeout(int timeout_seconds,
                                             const std::string& reason);
 
   // 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);
 
   WaitState wait_state_;
 
   Profile* profile_;
   ProfileSyncService* service_;
 
   // Returns a snapshot of the current sync session.
@@ skipping 16 matching lines @@
   std::string username_;
   std::string password_;
 
   // Client ID, used for logging purposes.
   int id_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceTestHarness);
 };
 
 #endif  // CHROME_TEST_LIVE_SYNC_PROFILE_SYNC_SERVICE_TEST_HARNESS_H_