Componentize TiclInvalidationService

components/invalidation/ticl_invalidation_service.cc

 // 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.
 
-#include "chrome/browser/invalidation/ticl_invalidation_service.h"
+#include "components/invalidation/ticl_invalidation_service.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
-#include "chrome/browser/invalidation/gcm_invalidation_bridge.h"
-#include "chrome/common/chrome_content_client.h"
 #include "components/gcm_driver/gcm_driver.h"
+#include "components/invalidation/gcm_invalidation_bridge.h"
 #include "components/invalidation/invalidation_service_util.h"
 #include "components/invalidation/non_blocking_invalidator.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "sync/internal_api/public/base/invalidator_state.h"
 #include "sync/notifier/invalidation_util.h"
 #include "sync/notifier/invalidator.h"
 #include "sync/notifier/object_id_invalidation_map.h"
 
 static const char* kOAuth2Scopes[] = {
@@ skipping 24 matching lines @@
   // has no significant state, -1 to never discard.
   -1,
 
   // Don't use initial delay unless the last request was an error.
   false,
 };
 
 namespace invalidation {
 
 TiclInvalidationService::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)
     : OAuth2TokenService::Consumer("ticl_invalidation"),
+      user_agent_(user_agent),
       identity_provider_(identity_provider.Pass()),
       settings_provider_(settings_provider.Pass()),
       invalidator_registrar_(new syncer::InvalidatorRegistrar()),
       request_access_token_backoff_(&kRequestAccessTokenBackoffPolicy),
       network_channel_type_(PUSH_CLIENT_CHANNEL),
       gcm_driver_(gcm_driver),
       request_context_(request_context),
       logger_() {}
 
 TiclInvalidationService::~TiclInvalidationService() {
@@ skipping 320 matching lines @@
   }
 
   UMA_HISTOGRAM_ENUMERATION(
       "Invalidations.NetworkChannel", network_channel, NETWORK_CHANNELS_COUNT);
   invalidator_.reset(new syncer::NonBlockingInvalidator(
           network_channel_creator,
           invalidation_state_tracker_->GetInvalidatorClientId(),
           invalidation_state_tracker_->GetSavedInvalidations(),
           invalidation_state_tracker_->GetBootstrapData(),
           invalidation_state_tracker_.get(),
-          GetUserAgent(),
+          user_agent_,
           request_context_));
 
   UpdateInvalidatorCredentials();
 
   invalidator_->RegisterHandler(this);
   invalidator_->UpdateRegisteredIds(
       this,
       invalidator_registrar_->GetAllRegisteredIds());
 }
 
@@ skipping 20 matching lines @@
 }
 
 void TiclInvalidationService::StopInvalidator() {
   DCHECK(invalidator_);
   gcm_invalidation_bridge_.reset();
   invalidator_->UnregisterHandler(this);
   invalidator_.reset();
 }
 
 }  // namespace invalidation