[Sync] Roll cache-invalidation to @70

chrome/browser/sync/notifier/chrome_invalidation_client.cc

Index: chrome/browser/sync/notifier/chrome_invalidation_client.cc
diff --git a/chrome/browser/sync/notifier/chrome_invalidation_client.cc b/chrome/browser/sync/notifier/chrome_invalidation_client.cc
index 1fe2de005ffd734a165d6adcfc7fbce519a96c52..ab5340febed34b41b44ec2ad357ddac7e8f96705 100644
--- a/chrome/browser/sync/notifier/chrome_invalidation_client.cc
+++ b/chrome/browser/sync/notifier/chrome_invalidation_client.cc
@@ -38,9 +38,9 @@ ChromeInvalidationClient::~ChromeInvalidationClient() {
 }
 
 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();
 
@@ -64,8 +64,8 @@ void ChromeInvalidationClient::Start(
   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();