Componentize TiclInvalidationService

components/invalidation/invalidation_service_test_template.h

Index: components/invalidation/invalidation_service_test_template.h
diff --git a/chrome/browser/invalidation/invalidation_service_test_template.h b/components/invalidation/invalidation_service_test_template.h
similarity index 97%
rename from chrome/browser/invalidation/invalidation_service_test_template.h
rename to components/invalidation/invalidation_service_test_template.h
index 52d00d4e4317f987547f892809d26338ccee6da4..e051424d91bc9277197f343317d4f25b8dd9a48d 100644
--- a/chrome/browser/invalidation/invalidation_service_test_template.h
+++ b/components/invalidation/invalidation_service_test_template.h
@@ -68,14 +68,13 @@
 //
 // Easy!
 
-#ifndef CHROME_BROWSER_INVALIDATION_INVALIDATION_SERVICE_TEST_TEMPLATE_H_
-#define CHROME_BROWSER_INVALIDATION_INVALIDATION_SERVICE_TEST_TEMPLATE_H_
+#ifndef COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_TEST_TEMPLATE_H_
+#define COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_TEST_TEMPLATE_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "components/invalidation/fake_invalidation_handler.h"
 #include "components/invalidation/invalidation_service.h"
-#include "content/public/test/test_browser_thread_bundle.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "sync/internal_api/public/base/ack_handle.h"
@@ -101,7 +100,6 @@ class InvalidationServiceTest : public testing::Test {
     return this->delegate_.GetInvalidationService();
   }
 
-  content::TestBrowserThreadBundle thread_bundle_;

[rlarocque, 2014/06/06 21:57:56]

I removed this line because I wanted to break the dependency on content/ and I
was curious to see which tests actually needed it.  Much to my surprise,
everything passed.

I guess this wasn't really needed?  See discussions in

https://codereview.chromium.org/221963003/diff/20001/chrome/browser/invalidat...

and 

https://codereview.chromium.org/221963003/diff/20001/chrome/browser/invalidat...

[bartfab (slow), 2014/06/10 11:45:13]

As you can see in the comment, the TestBrowserThreadBundle was needed because to
correctly dispose of an object owned by a TestingProfile. This test appears to
no longer be using TestingProfile. Thus, it should work without a 
TestBrowserThreadBundle.

   InvalidatorTestDelegate delegate_;
 
   const invalidation::ObjectId id1;
@@ -387,4 +385,4 @@ REGISTER_TYPED_TEST_CASE_P(InvalidationServiceTest,
                            Basic, MultipleHandlers, EmptySetUnregisters,
                            GetInvalidatorStateAlwaysCurrent);
 
-#endif  // CHROME_BROWSER_INVALIDATION_INVALIDATION_SERVICE_TEST_TEMPLATE_H_
+#endif  // COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_TEST_TEMPLATE_H_