Reduce dependency of TiclInvalidationService on Profile

chrome/browser/invalidation/ticl_invalidation_service_unittest.cc

Index: chrome/browser/invalidation/ticl_invalidation_service_unittest.cc
diff --git a/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc b/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc
index 9c90df77c3f9f58a1c6d3d1ad39c4df3a83e33e6..2569c8b7c063f49e69eb7b58583cd48c21aeb2c9 100644
--- a/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc
+++ b/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc
@@ -7,6 +7,7 @@
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/invalidation/invalidation_service_factory.h"
 #include "chrome/browser/invalidation/invalidation_service_test_template.h"
+#include "chrome/browser/invalidation/invalidator_storage.h"
 #include "chrome/browser/invalidation/profile_invalidation_auth_provider.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
@@ -14,8 +15,11 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/signin/core/browser/signin_manager.h"
+#include "content/public/test/test_browser_thread_bundle.h"
+#include "net/url_request/url_request_context_getter.h"
 #include "sync/notifier/fake_invalidation_handler.h"
 #include "sync/notifier/fake_invalidator.h"
+#include "sync/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/invalidation_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -43,6 +47,9 @@ class TiclInvalidationServiceTestDelegate {
                 SigninManagerFactory::GetForProfile(profile_.get()),
                 token_service_.get(),
                 NULL)),
+        profile_->GetRequestContext(),
+        scoped_ptr<syncer::InvalidationStateTracker>(
+            new InvalidatorStorage(profile_->GetPrefs())),
         profile_.get()));
   }
 
@@ -95,8 +102,12 @@ class TiclInvalidationServiceChannelTest : public ::testing::Test {
     scoped_ptr<InvalidationAuthProvider> auth_provider(
         new ProfileInvalidationAuthProvider(
             fake_signin_manager_, token_service_.get(), NULL));
-    invalidation_service_.reset(
-        new TiclInvalidationService(auth_provider.Pass(), profile_.get()));
+    invalidation_service_.reset(new TiclInvalidationService(
+        auth_provider.Pass(),
+        profile_->GetRequestContext(),
+        scoped_ptr<syncer::InvalidationStateTracker>(
+            new InvalidatorStorage(profile_->GetPrefs())),
+        profile_.get()));
     invalidation_service_->Init();
   }
 
@@ -109,6 +120,7 @@ class TiclInvalidationServiceChannelTest : public ::testing::Test {
   }
 
  protected:
+  content::TestBrowserThreadBundle thread_bundle_;

[dcheng, 2014/04/11 19:54:00]

Again, why do we need browser threads now?

[bartfab (slow), 2014/04/14 09:20:08]

The URLRequestContextGetter is created and owned by the TestingProfile now (see
line 50). When a TestingProfile has a URLRequestContextGetter, it makes sure to
delete it on the IO thread, which runs into a CHECK if the IO thread does not
exist (see testing_profile.cc line 410).

   scoped_ptr<TestingProfile> profile_;
   SigninManagerBase* fake_signin_manager_;
   scoped_ptr<FakeProfileOAuth2TokenService> token_service_;