Use FakeServer-based invalidations for Sync tests

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

Index: chrome/browser/sync/test/integration/fake_server_invalidation_service.h
diff --git a/chrome/browser/sync/test/integration/fake_server_invalidation_service.h b/chrome/browser/sync/test/integration/fake_server_invalidation_service.h
new file mode 100644
index 0000000000000000000000000000000000000000..213176849b6b63695bc62571f416236bfb4c5734
--- /dev/null
+++ b/chrome/browser/sync/test/integration/fake_server_invalidation_service.h
@@ -0,0 +1,72 @@
+// Copyright 2014 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_FAKE_SERVER_INVALIDATION_SERVICE_H_
+#define CHROME_BROWSER_SYNC_TEST_INTEGRATION_FAKE_SERVER_INVALIDATION_SERVICE_H_
+
+#include <string>
+#include <utility>
+
+#include "base/basictypes.h"
+#include "chrome/browser/invalidation/fake_invalidation_service.h"
+#include "chrome/browser/invalidation/invalidation_auth_provider.h"
+#include "chrome/browser/invalidation/invalidation_service.h"
+#include "sync/internal_api/public/base/model_type.h"
+#include "sync/notifier/mock_ack_handler.h"
+#include "sync/test/fake_server/fake_server.h"
+
+namespace content {
+class BrowserContext;
+}
+
+namespace invalidation {
+class InvalidationLogger;
+}
+
+namespace syncer {
+class Invalidation;
+}
+
+namespace fake_server {
+
+// An InvalidationService that is used in conjunction with FakeServer.
+class FakeServerInvalidationService : public invalidation::InvalidationService,
+                                      public FakeServer::Observer {
+ public:
+  FakeServerInvalidationService();
+  virtual ~FakeServerInvalidationService();
+
+  static KeyedService* Build(content::BrowserContext* context);
+
+  virtual void RegisterInvalidationHandler(
+      syncer::InvalidationHandler* handler) OVERRIDE;
+  virtual void UpdateRegisteredInvalidationIds(
+      syncer::InvalidationHandler* handler,
+      const syncer::ObjectIdSet& ids) OVERRIDE;
+  virtual void UnregisterInvalidationHandler(
+      syncer::InvalidationHandler* handler) OVERRIDE;
+
+  virtual syncer::InvalidatorState GetInvalidatorState() const OVERRIDE;
+  virtual std::string GetInvalidatorClientId() const OVERRIDE;
+  virtual invalidation::InvalidationLogger* GetInvalidationLogger() OVERRIDE;
+  virtual void RequestDetailedStatus(
+      base::Callback<void(const base::DictionaryValue&)> caller) const OVERRIDE;
+  virtual invalidation::InvalidationAuthProvider* GetInvalidationAuthProvider()
+      OVERRIDE;
+
+  // FakeServer::Observer:
+  virtual void OnCommit(syncer::ModelTypeSet committed_model_types) OVERRIDE;
+
+ private:
+  // FakeServerInvalidationService delegates all InvalidationService behavior
+  // to FakeInvalidationService.
+  invalidation::FakeInvalidationService fake_invalidation_service_;
+
+  DISALLOW_COPY_AND_ASSIGN(FakeServerInvalidationService);
+};
+
+}  // namespace fake_server
+
+#endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_FAKE_SERVER_INVALIDATION_SERVICE_H_
+