Make use of InvalidationService

chrome/browser/invalidation/ticl_invalidation_service.h

Index: chrome/browser/invalidation/ticl_invalidation_service.h
diff --git a/chrome/browser/invalidation/ticl_invalidation_service.h b/chrome/browser/invalidation/ticl_invalidation_service.h
index dde660637a1de43de899a973a643ef3f0a60fac8..1065a75691d85ea7551d8ef791fafd6bc9f0510c 100644
--- a/chrome/browser/invalidation/ticl_invalidation_service.h
+++ b/chrome/browser/invalidation/ticl_invalidation_service.h
@@ -7,7 +7,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
-#include "chrome/browser/invalidation/invalidation_frontend.h"
+#include "chrome/browser/invalidation/invalidation_service.h"
 #include "chrome/browser/invalidation/invalidator_storage.h"
 #include "chrome/browser/signin/signin_global_error.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
@@ -24,14 +24,18 @@ namespace syncer {
 class Invalidator;
 }
 
+//TODO: Remove this dependency.  See crbug.com/243482.
+namespace extensions {
+class PushMessagingApiTest;
+}
+
 namespace invalidation {
 
 // This InvalidationService wraps the C++ Invalidation Client (TICL) library.
 // It provides invalidations for desktop platforms (Win, Mac, Linux).
 class TiclInvalidationService
     : public base::NonThreadSafe,
-      public BrowserContextKeyedService,
-      public InvalidationFrontend,
+      public InvalidationService,
       public content::NotificationObserver,
       public syncer::InvalidationHandler {
  public:
@@ -42,7 +46,7 @@ class TiclInvalidationService
 
   void Init();
 
-  // InvalidationFrontend implementation.
+  // InvalidationService implementation.
   // It is an error to have registered handlers when Shutdown() is called.
   virtual void RegisterInvalidationHandler(
       syncer::InvalidationHandler* handler) OVERRIDE;
@@ -55,7 +59,7 @@ class TiclInvalidationService
       const invalidation::ObjectId& id,
       const syncer::AckHandle& ack_handle) OVERRIDE;
   virtual syncer::InvalidatorState GetInvalidatorState() const OVERRIDE;
-  virtual std::string GetInvalidatorClientId() const;
+  virtual std::string GetInvalidatorClientId() const OVERRIDE;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
@@ -76,6 +80,7 @@ class TiclInvalidationService
   void InitForTest(syncer::Invalidator* invalidator);
 
   friend class TiclInvalidationServiceTestDelegate;
+  friend class extensions::PushMessagingApiTest;
 
  private:
   bool IsReadyToStart();