[Sync] Roll cache-invalidation to @70

chrome/browser/sync/notifier/chrome_invalidation_client.cc

 // Copyright (c) 2010 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/sync/notifier/chrome_invalidation_client.h"
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ skipping 20 matching lines @@
 }
 
 ChromeInvalidationClient::~ChromeInvalidationClient() {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   Stop();
   DCHECK(!listener_);
   DCHECK(!state_writer_);
 }
 
 void ChromeInvalidationClient::Start(
-    const std::string& client_id, const std::string& state,
-    Listener* listener, StateWriter* state_writer,
-    base::WeakPtr<talk_base::Task> base_task) {
+    const std::string& client_id, const std::string& client_info,
+    const std::string& state, Listener* listener,
+    StateWriter* state_writer, base::WeakPtr<talk_base::Task> base_task) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   Stop();
 
   chrome_system_resources_.StartScheduler();
 
   DCHECK(!listener_);
   DCHECK(listener);
   listener_ = listener;
   DCHECK(!state_writer_);
   DCHECK(state_writer);
   state_writer_ = state_writer;
 
   invalidation::ClientType client_type;
   client_type.set_type(invalidation::ClientType::CHROME_SYNC);
   // TODO(akalin): Use InvalidationClient::Create() once it supports
   // taking a ClientConfig.
   invalidation::ClientConfig client_config;
   // Bump up limits so that we reduce the number of registration
   // replies we get.
   client_config.max_registrations_per_message = 20;
   client_config.max_ops_per_message = 40;
   invalidation_client_.reset(
       new invalidation::InvalidationClientImpl(
-          &chrome_system_resources_, client_type, client_id, client_config,
-          this));
+          &chrome_system_resources_, client_type, client_id,
+          client_info, client_config, this));

[ghc, 2011/01/24 23:09:34]

client_info should fit on the previous line, no?

[akalin, 2011/01/24 23:17:17]

Done.

   invalidation_client_->Start(state);
   invalidation::NetworkEndpoint* network_endpoint =
       invalidation_client_->network_endpoint();
   CHECK(network_endpoint);
   network_endpoint->RegisterOutboundListener(
       handle_outbound_packet_callback_.get());
   ChangeBaseTask(base_task);
   registration_manager_.reset(
       new RegistrationManager(invalidation_client_.get()));
   RegisterTypes();
@@ skipping 130 matching lines @@
 
 void ChromeInvalidationClient::HandleOutboundPacket(
     invalidation::NetworkEndpoint* const& network_endpoint) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   CHECK(cache_invalidation_packet_handler_.get());
   cache_invalidation_packet_handler_->
       HandleOutboundPacket(network_endpoint);
 }
 
 }  // namespace sync_notifier