Componentize TiclInvalidationService

components/invalidation/ticl_invalidation_service.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // 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>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
@@ skipping 36 matching lines @@
   enum InvalidationNetworkChannel {
     PUSH_CLIENT_CHANNEL = 0,
     GCM_NETWORK_CHANNEL = 1,
 
     // This enum is used in UMA_HISTOGRAM_ENUMERATION. Insert new values above
     // this line.
     NETWORK_CHANNELS_COUNT = 2
   };
 
   TiclInvalidationService(
+      const std::string& user_agent,
       scoped_ptr<IdentityProvider> identity_provider,
       scoped_ptr<TiclSettingsProvider> settings_provider,
       gcm::GCMDriver* gcm_driver,
       const scoped_refptr<net::URLRequestContextGetter>& request_context);
   virtual ~TiclInvalidationService();
 
   void Init(
       scoped_ptr<syncer::InvalidationStateTracker> invalidation_state_tracker);
 
   // InvalidationService implementation.
@@ skipping 54 matching lines @@
   friend class TiclProfileSettingsProviderTest;
 
   bool IsReadyToStart();
   bool IsStarted() const;
 
   void StartInvalidator(InvalidationNetworkChannel network_channel);
   void UpdateInvalidationNetworkChannel();
   void UpdateInvalidatorCredentials();
   void StopInvalidator();
 
+  const std::string user_agent_;
+
   scoped_ptr<IdentityProvider> identity_provider_;
   scoped_ptr<TiclSettingsProvider> settings_provider_;
 
   scoped_ptr<syncer::InvalidatorRegistrar> invalidator_registrar_;
   scoped_ptr<syncer::InvalidationStateTracker> invalidation_state_tracker_;
   scoped_ptr<syncer::Invalidator> invalidator_;
 
   // TiclInvalidationService needs to remember access token in order to
   // invalidate it with OAuth2TokenService.
   std::string access_token_;
@@ skipping 15 matching lines @@
 
   // Keep a copy of the important parameters used in network channel creation
   // for debugging.
   base::DictionaryValue network_channel_options_;
 
   DISALLOW_COPY_AND_ASSIGN(TiclInvalidationService);
 };
 
 }  // namespace invalidation
 
-#endif  // CHROME_BROWSER_INVALIDATION_TICL_INVALIDATION_SERVICE_H_
+#endif  // COMPONENTS_INVALIDATION_TICL_INVALIDATION_SERVICE_H_