Introduce ProfileInvalidationProvider wrapper for InvalidationService

components/invalidation/invalidation_service.h

 // 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 COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_H_
 #define COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_H_
 
 #include "base/callback_forward.h"
-#include "components/keyed_service/core/keyed_service.h"
 #include "sync/internal_api/public/base/invalidator_state.h"
 #include "sync/notifier/invalidation_util.h"
 
 class IdentityProvider;
 
 namespace syncer {
 class InvalidationHandler;
 }  // namespace syncer
 
 namespace invalidation {
@@ skipping 37 matching lines @@
 //
 // It is an error to have registered handlers when an
 // InvalidationFrontend is shut down; clients must ensure that they
 // unregister themselves before then. (Depending on the
 // InvalidationFrontend, shutdown may be equivalent to destruction, or
 // a separate function call like Shutdown()).
 //
 // NOTE(akalin): Invalidations that come in during browser shutdown may get
 // dropped.  This won't matter once we have an Acknowledge API, though: see
 // http://crbug.com/78462 and http://crbug.com/124149.
-//
-// This class inherits from ProfileKeyedService to make it possible to correctly
-// cast from various InvalidationService implementations to ProfileKeyedService
-// in InvalidationServiceFactory.
-class InvalidationService : public KeyedService {
+class InvalidationService {
  public:
+  virtual ~InvalidationService() {}
+
   // Starts sending notifications to |handler|.  |handler| must not be NULL,
   // and it must not already be registered.
   //
   // Handler registrations are persisted across restarts of sync.
   virtual void RegisterInvalidationHandler(
       syncer::InvalidationHandler* handler) = 0;
 
   // Updates the set of ObjectIds associated with |handler|.  |handler| must
   // not be NULL, and must already be registered.  An ID must be registered for
   // at most one handler.
@@ skipping 22 matching lines @@
 
   // Return the logger used to debug invalidations
   virtual InvalidationLogger* GetInvalidationLogger() = 0;
 
   // Triggers requests of internal status.
   virtual void RequestDetailedStatus(
       base::Callback<void(const base::DictionaryValue&)> post_caller) const = 0;
 
   // Returns the identity provider.
   virtual IdentityProvider* GetIdentityProvider() = 0;
-
- protected:
-  virtual ~InvalidationService() { }
 };
 
 }  // namespace invalidation
 
 #endif  // COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_H_