Make invalidations work for Chrome OS Kiosk Apps.

chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc

Index: chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc
diff --git a/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc b/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc
index 5c96e8b8d76a6d659fde0bb9054ae76c5ff5e500..a650b3435aa6a72111613a03a07a35145e010c80 100644
--- a/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc
+++ b/chrome/browser/invalidation/gcm_invalidation_bridge_unittest.cc
@@ -3,13 +3,10 @@
 // found in the LICENSE file.
 
 #include "base/run_loop.h"
+#include "chrome/browser/invalidation/fake_invalidation_service.h"
 #include "chrome/browser/invalidation/gcm_invalidation_bridge.h"
-#include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
-#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
+#include "chrome/browser/invalidation/invalidation_auth_provider.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
-#include "chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.h"
-#include "chrome/browser/signin/profile_oauth2_token_service.h"
-#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/google_service_auth_error.h"
@@ -25,18 +22,7 @@ class GCMInvalidationBridgeTest : public ::testing::Test {
   virtual ~GCMInvalidationBridgeTest() {}
 
   virtual void SetUp() OVERRIDE {
-    TestingProfile::Builder builder;
-    builder.AddTestingFactory(
-        ProfileOAuth2TokenServiceFactory::GetInstance(),
-        FakeProfileOAuth2TokenServiceWrapper::BuildAutoIssuingTokenService);
-    profile_ = builder.Build();
-
-    FakeProfileOAuth2TokenService* token_service =
-        (FakeProfileOAuth2TokenService*)
-        ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
-    token_service->IssueRefreshTokenForUser("", "refresh_token");
-
-    bridge_.reset(new GCMInvalidationBridge(profile_.get()));
+    bridge_.reset(new GCMInvalidationBridge(NULL, &auth_provider_));
 
     delegate_ = bridge_->CreateDelegate();
     delegate_->Initialize();
@@ -55,8 +41,7 @@ class GCMInvalidationBridgeTest : public ::testing::Test {
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
-  scoped_ptr<Profile> profile_;
-  FakeProfileOAuth2TokenService* token_service_;
+  FakeInvalidationAuthProvider auth_provider_;
 
   std::vector<std::string> issued_tokens_;
   std::vector<GoogleServiceAuthError> request_token_errors_;