Control invalidations network channel from TiclInvalidationService

sync/notifier/sync_invalidation_listener.cc

 // Copyright (c) 2012 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 "sync/notifier/sync_invalidation_listener.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 12 matching lines @@
 
 const char kApplicationName[] = "chrome-sync";
 
 }  // namespace
 
 namespace syncer {
 
 SyncInvalidationListener::Delegate::~Delegate() {}
 
 SyncInvalidationListener::SyncInvalidationListener(
-    scoped_ptr<notifier::PushClient> push_client)
-    : push_client_channel_(push_client.Pass()),
-      sync_system_resources_(&push_client_channel_, this),
+    scoped_ptr<SyncNetworkChannel> network_channel)
+    : sync_network_channel_(network_channel.Pass()),
+      sync_system_resources_(sync_network_channel_.get(), this),
       delegate_(NULL),
       ticl_state_(DEFAULT_INVALIDATION_ERROR),
       push_client_state_(DEFAULT_INVALIDATION_ERROR),
       weak_ptr_factory_(this) {
   DCHECK(CalledOnValidThread());
-  push_client_channel_.AddObserver(this);
+  sync_network_channel_->AddObserver(this);
 }
 
 SyncInvalidationListener::~SyncInvalidationListener() {
   DCHECK(CalledOnValidThread());
-  push_client_channel_.RemoveObserver(this);
+  sync_network_channel_->RemoveObserver(this);
   Stop();
   DCHECK(!delegate_);
 }
 
 void SyncInvalidationListener::Start(
     const CreateInvalidationClientCallback&
         create_invalidation_client_callback,
     const std::string& client_id, const std::string& client_info,
     const std::string& invalidation_bootstrap_data,
     const UnackedInvalidationsMap& initial_unacked_invalidations,
@@ skipping 30 matching lines @@
           kApplicationName, this));
   invalidation_client_->Start();
 
   registration_manager_.reset(
       new RegistrationManager(invalidation_client_.get()));
 }
 
 void SyncInvalidationListener::UpdateCredentials(
     const std::string& email, const std::string& token) {
   DCHECK(CalledOnValidThread());
-  push_client_channel_.UpdateCredentials(email, token);
+  sync_network_channel_->UpdateCredentials(email, token);
 }
 
 void SyncInvalidationListener::UpdateRegisteredIds(const ObjectIdSet& ids) {
   DCHECK(CalledOnValidThread());
   registered_ids_ = ids;
   // |ticl_state_| can go to INVALIDATIONS_ENABLED even without a
   // working XMPP connection (as observed by us), so check it instead
   // of GetState() (see http://crbug.com/139424).
   if (ticl_state_ == INVALIDATIONS_ENABLED && registration_manager_) {
     DoRegistrationUpdate();
@@ skipping 303 matching lines @@
 }
 
 void SyncInvalidationListener::OnNetworkChannelStateChanged(
     InvalidatorState invalidator_state) {
   DCHECK(CalledOnValidThread());
   push_client_state_ = invalidator_state;
   EmitStateChange();
 }
 
 }  // namespace syncer