Componentize TiclInvalidationService

components/invalidation/ticl_invalidation_service.h

Index: components/invalidation/ticl_invalidation_service.h
diff --git a/chrome/browser/invalidation/ticl_invalidation_service.h b/components/invalidation/ticl_invalidation_service.h
similarity index 96%
rename from chrome/browser/invalidation/ticl_invalidation_service.h
rename to components/invalidation/ticl_invalidation_service.h
index 290882c34462c02643b1e65d3570b08b86850026..e201d426dd7a706f65d92a6a31d96ecef42468b2 100644
--- a/chrome/browser/invalidation/ticl_invalidation_service.h
+++ b/components/invalidation/ticl_invalidation_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_INVALIDATION_TICL_INVALIDATION_SERVICE_H_
-#define CHROME_BROWSER_INVALIDATION_TICL_INVALIDATION_SERVICE_H_
+#ifndef COMPONENTS_INVALIDATION_TICL_INVALIDATION_SERVICE_H_
+#define COMPONENTS_INVALIDATION_TICL_INVALIDATION_SERVICE_H_
 
 #include <string>
 
@@ -60,6 +60,7 @@ class TiclInvalidationService : public base::NonThreadSafe,
   };
 
   TiclInvalidationService(
+      const std::string& user_agent,
       scoped_ptr<IdentityProvider> identity_provider,
       scoped_ptr<TiclSettingsProvider> settings_provider,
       gcm::GCMDriver* gcm_driver,
@@ -134,6 +135,8 @@ class TiclInvalidationService : public base::NonThreadSafe,
   void UpdateInvalidatorCredentials();
   void StopInvalidator();
 
+  const std::string user_agent_;
+
   scoped_ptr<IdentityProvider> identity_provider_;
   scoped_ptr<TiclSettingsProvider> settings_provider_;
 
@@ -169,4 +172,4 @@ class TiclInvalidationService : public base::NonThreadSafe,
 
 }  // namespace invalidation
 
-#endif  // CHROME_BROWSER_INVALIDATION_TICL_INVALIDATION_SERVICE_H_
+#endif  // COMPONENTS_INVALIDATION_TICL_INVALIDATION_SERVICE_H_