Merge 208347 "Revert 208315 "Make use of InvalidationService""

chrome/browser/sync/profile_sync_service_harness.h

Index: chrome/browser/sync/profile_sync_service_harness.h
===================================================================
--- chrome/browser/sync/profile_sync_service_harness.h	(revision 208727)
+++ chrome/browser/sync/profile_sync_service_harness.h	(working copy)
@@ -18,10 +18,6 @@
 
 class Profile;
 
-namespace invalidation {
-class P2PInvalidationService;
-}
-
 namespace browser_sync {
 namespace sessions {
 class SyncSessionSnapshot;
@@ -37,19 +33,17 @@
     : public ProfileSyncServiceObserver,
       public browser_sync::MigrationObserver {
  public:
-  static ProfileSyncServiceHarness* Create(
-      Profile* profile,
-      const std::string& username,
-      const std::string& password);
+  ProfileSyncServiceHarness(Profile* profile,
+                            const std::string& username,
+                            const std::string& password);
 
-  static ProfileSyncServiceHarness* CreateForIntegrationTest(
-      Profile* profile,
-      const std::string& username,
-      const std::string& password,
-      invalidation::P2PInvalidationService* invalidation_service);
-
   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
+  // takes ownership.
+  static ProfileSyncServiceHarness* CreateAndAttach(Profile* profile);
+
   // Sets the GAIA credentials with which to sign in to sync.
   void SetCredentials(const std::string& username, const std::string& password);
 
@@ -68,7 +62,6 @@
 
   // ProfileSyncServiceObserver implementation.
   virtual void OnStateChanged() OVERRIDE;
-  virtual void OnSyncCycleCompleted() OVERRIDE;
 
   // MigrationObserver implementation.
   virtual void OnMigrationStateChange() OVERRIDE;
@@ -277,12 +270,6 @@
     NUMBER_OF_STATES,
   };
 
-  ProfileSyncServiceHarness(
-      Profile* profile,
-      const std::string& username,
-      const std::string& password,
-      invalidation::P2PInvalidationService* invalidation_service);
-
   // Listen to migration events if the migrator has been initialized
   // and we're not already listening.  Returns true if we started
   // listening.
@@ -347,9 +334,6 @@
   // ProfileSyncService object associated with |profile_|.
   ProfileSyncService* service_;
 
-  // P2PInvalidationService associated with |profile_|.
-  invalidation::P2PInvalidationService* p2p_invalidation_service_;
-
   // The harness of the client whose update progress marker we're expecting
   // eventually match.
   ProfileSyncServiceHarness* progress_marker_partner_;