[Sync] Roll cache-invalidation to @70

chrome/browser/sync/notifier/server_notifier_thread.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/server_notifier_thread.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "chrome/browser/sync/notifier/chrome_invalidation_client.h"
+#include "googleurl/src/gurl.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "jingle/notifier/listener/notification_defines.h"
 #include "talk/xmpp/xmppclient.h"
+#include "webkit/glue/webkit_glue.h"
 
 namespace sync_notifier {
 
 ServerNotifierThread::ServerNotifierThread(
     const notifier::NotifierOptions& notifier_options,
     const std::string& state, StateWriter* state_writer)
     : notifier::MediatorThreadImpl(notifier_options),
       state_(state),
       state_writers_(new ObserverListThreadSafe<StateWriter>()),
       state_writer_(state_writer) {
@@ skipping 81 matching lines @@
     chrome_invalidation_client_->ChangeBaseTask(base_task_);
   } else {
     // Otherwise, create the invalidation client.
     chrome_invalidation_client_.reset(new ChromeInvalidationClient());
 
     // TODO(akalin): Make cache_guid() part of the client ID.  If we do
     // so and we somehow propagate it up to the server somehow, we can
     // make it so that we won't receive any notifications that were
     // generated from our own changes.
     const std::string kClientId = "server_notifier_thread";
+    // Use user agent as |client_info| so we can use it for debugging
+    // server-side.
+    const std::string& client_info = webkit_glue::GetUserAgent(GURL());
     chrome_invalidation_client_->Start(
-        kClientId, state_, this, this, base_task_);
+        kClientId, client_info, state_, this, this, base_task_);
     state_.clear();
   }
 }
 
 void ServerNotifierThread::RegisterTypesAndSignalSubscribed() {
   DCHECK_EQ(MessageLoop::current(), worker_message_loop());
   if (!chrome_invalidation_client_.get()) {
     return;
   }
   chrome_invalidation_client_->RegisterTypes();
   observers_->Notify(&Observer::OnSubscriptionStateChange, true);
 }
 
 void ServerNotifierThread::StopInvalidationListener() {
   DCHECK_EQ(MessageLoop::current(), worker_message_loop());
   chrome_invalidation_client_.reset();
 }
 
 }  // namespace sync_notifier