Use FakeServer-based invalidations for Sync tests (try #2)

chrome/browser/sync/test/integration/sync_test.h

 // Copyright 2013 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_TEST_INTEGRATION_SYNC_TEST_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 14 matching lines @@
 class ProfileSyncService;
 class ProfileSyncServiceHarness;
 class P2PInvalidationForwarder;
 
 namespace base {
 class CommandLine;
 }
 
 namespace fake_server {
 class FakeServer;
+class FakeServerInvalidationService;
 }
 
 namespace net {
 class FakeURLFetcherFactory;
 class ProxyConfig;
 class ScopedDefaultHostResolverProc;
 class URLFetcherImplFactory;
 class URLRequestContextGetter;
 }
 
@@ skipping 311 matching lines @@
 
   // Helper method used to clear any fake responses that might have been set for
   // various gaia URLs, cancel any outstanding URL requests, and return to using
   // the default URLFetcher creation mechanism.
   void ClearMockGaiaResponses();
 
   // Decide which sync server implementation to run against based on the type
   // of test being run and command line args passed in.
   void DecideServerType();
 
+  // Sets up the client-side invalidations infrastructure depending on the
+  // value of |server_type_|.
+  void InitializeInvalidations(int index);
+
   // Python sync test server, started on demand.
   syncer::LocalSyncTestServer sync_server_;
 
   // Helper class to whitelist the notification port.
   scoped_ptr<net::ScopedPortException> xmpp_port_;
 
   // Used to differentiate between single-client, two-client, multi-client and
   // many-client tests.
   TestType test_type_;
 
@@ skipping 16 matching lines @@
 
   // Collection of sync clients used by a test. A sync client is associated with
   // a sync profile, and implements methods that sync the contents of the
   // profile with the server.
   ScopedVector<ProfileSyncServiceHarness> clients_;
 
   // A set of objects to listen for commit activity and broadcast notifications
   // of this activity to its peer sync clients.
   ScopedVector<P2PInvalidationForwarder> invalidation_forwarders_;
 
+  // Collection of pointers to FakeServerInvalidation objects for each profile.
+  std::vector<fake_server::FakeServerInvalidationService*>
+      fake_server_invalidation_services_;
+
   // Sync profile against which changes to individual profiles are verified. We
   // don't need a corresponding verifier sync client because the contents of the
   // verifier profile are strictly local, and are not meant to be synced.
   Profile* verifier_;
 
   // Indicates whether changes to a profile should also change the verifier
   // profile or not.
   bool use_verifier_;
 
   // Indicates whether or not notifications were explicitly enabled/disabled.
@@ skipping 11 matching lines @@
   // Fake URLFetcher factory used to mock out GAIA signin.
   scoped_ptr<net::FakeURLFetcherFactory> fake_factory_;
 
   // The URLFetcherImplFactory instance used to instantiate |fake_factory_|.
   scoped_ptr<net::URLFetcherImplFactory> factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncTest);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_