Fix passphrase initialization flow in ProfileSyncServiceHarness

chrome/browser/sync/profile_sync_service_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_BROWSER_SYNC_PROFILE_SYNC_SERVICE_HARNESS_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_HARNESS_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/time.h"
 #include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/common/notification_observer.h"
-#include "chrome/common/notification_registrar.h"
 
 using browser_sync::sessions::SyncSessionSnapshot;
 
 class Profile;
 
 // An instance of this class is basically our notion of a "sync client" for
 // automation purposes. It harnesses the ProfileSyncService member of the
 // profile passed to it on construction and automates certain things like setup
 // and authentication. It provides ways to "wait" adequate periods of time for
 // several clients to get to the same state.
-class ProfileSyncServiceHarness : public ProfileSyncServiceObserver,
-                                  public NotificationObserver {
+class ProfileSyncServiceHarness : public ProfileSyncServiceObserver {
  public:
   ProfileSyncServiceHarness(Profile* profile,
                             const std::string& username,
                             const std::string& password,
                             int id);
 
   virtual ~ProfileSyncServiceHarness() {}
 
   // Creates a ProfileSyncServiceHarness object and attaches it to |profile|, a
   // profile that is assumed to have been signed into sync in the past. Caller
@@ skipping 12 matching lines @@
   // changes.
   bool SetupSync();
 
   // Same as the above method, but enables sync only for the datatypes contained
   // in |synced_datatypes|.
   bool SetupSync(const syncable::ModelTypeSet& synced_datatypes);
 
   // ProfileSyncServiceObserver implementation.
   virtual void OnStateChanged();
 
-  // NotificationObserver implementation.
-  virtual void Observe(NotificationType type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
-
   // 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);
 
   // Calling this acts as a barrier and blocks the caller until |this| and
   // |partner| have both completed a sync cycle.  When calling this method,
@@ skipping 101 matching lines @@
   // Returns true if the sync client has no unsynced items.
   bool IsSynced();
 
   // Logs message with relevant info about client's sync state (if available).
   void LogClientInfo(std::string message);
 
   // Updates |last_timestamp_| with the timestamp of the current sync session.
   // Returns the new value of |last_timestamp_|.
   int64 GetUpdatedTimestamp();
 
-  void StartObservingPassphraseEvents();
-
   WaitState wait_state_;
 
   Profile* profile_;
   ProfileSyncService* service_;
 
   // This value tracks the max sync timestamp (e.g. synced-to revision) inside
   // the sync engine.  It gets updated when a sync cycle ends and the session
   // snapshot implies syncing is "done".
   int64 last_timestamp_;
 
   // The minimum value of the 'max_local_timestamp' member of a
   // SyncSessionSnapshot we need to wait to observe in OnStateChanged when told
   // to WaitUntilTimestampIsAtLeast(...).
   int64 min_timestamp_needed_;
 
   // Credentials used for GAIA authentication.
   std::string username_;
   std::string password_;
 
-  // A counter to track the number of await passphrase requests versus
-  // actual acceptances.  Can go negative if #requests > #acceptances.
-  int passphrase_acceptance_counter_;
-
-  NotificationRegistrar registrar_;
-
   // Client ID, used for logging purposes.
   int id_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceHarness);
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_HARNESS_H_