1 files changed, 4 insertions, 24 deletions
diff --git a/chrome/browser/invalidation/fake_invalidation_service.h b/chrome/browser/invalidation/fake_invalidation_service.h
index d958bf5..eb7e20d 100644
--- a/chrome/browser/invalidation/fake_invalidation_service.h
+++ b/chrome/browser/invalidation/fake_invalidation_service.h
@@ -10,9 +10,9 @@
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
-#include "chrome/browser/invalidation/invalidation_auth_provider.h"
 #include "chrome/browser/invalidation/invalidation_service.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
+#include "google_apis/gaia/fake_identity_provider.h"
 #include "sync/notifier/invalidator_registrar.h"
 #include "sync/notifier/mock_ack_handler.h"
 
@@ -28,27 +28,6 @@ namespace invalidation {
 
 class InvalidationLogger;
 
-// Fake invalidation auth provider implementation.
-class FakeInvalidationAuthProvider : public InvalidationAuthProvider {
- public:
-  FakeInvalidationAuthProvider();
-  virtual ~FakeInvalidationAuthProvider();
-
-  // InvalidationAuthProvider:
-  virtual OAuth2TokenService* GetTokenService() OVERRIDE;
-  virtual std::string GetAccountId() OVERRIDE;
-  virtual bool ShowLoginUI() OVERRIDE;
-
-  FakeProfileOAuth2TokenService* fake_token_service() {
-    return &token_service_;
-  }
-
- private:
-  FakeProfileOAuth2TokenService token_service_;
-
-  DISALLOW_COPY_AND_ASSIGN(FakeInvalidationAuthProvider);
-};
-
 // An InvalidationService that emits invalidations only when
 // its EmitInvalidationForTest method is called.
 class FakeInvalidationService : public InvalidationService {
@@ -71,7 +50,7 @@ class FakeInvalidationService : public InvalidationService {
   virtual InvalidationLogger* GetInvalidationLogger() OVERRIDE;
   virtual void RequestDetailedStatus(
       base::Callback<void(const base::DictionaryValue&)> caller) const OVERRIDE;
-  virtual InvalidationAuthProvider* GetInvalidationAuthProvider() OVERRIDE;
+  virtual IdentityProvider* GetIdentityProvider() OVERRIDE;
 
   void SetInvalidatorState(syncer::InvalidatorState state);
 
@@ -89,7 +68,8 @@ class FakeInvalidationService : public InvalidationService {
   std::string client_id_;
   syncer::InvalidatorRegistrar invalidator_registrar_;
   syncer::MockAckHandler mock_ack_handler_;
-  FakeInvalidationAuthProvider auth_provider_;
+  FakeProfileOAuth2TokenService token_service_;
+  FakeIdentityProvider identity_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeInvalidationService);
 };