Pass chrome version and channel in CHLO message to server.

chrome/browser/net/http_server_properties_manager.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 "chrome/browser/net/http_server_properties_manager.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
 using content::BrowserThread;
 
 namespace chrome_browser_net {
 
@@ skipping 57 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   io_weak_ptr_factory_.reset();
 }
 
 void HttpServerPropertiesManager::InitializeOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   io_weak_ptr_factory_.reset(
       new base::WeakPtrFactory<HttpServerPropertiesManager>(this));
   http_server_properties_impl_.reset(new net::HttpServerPropertiesImpl());
 
+  std::string client_version;
+  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
+  switch (channel) {
+    case chrome::VersionInfo::CHANNEL_CANARY:
+      client_version = "C ";

[ramant (doing other things), 2014/06/04 21:30:36]

Should we define an enum vs the first letter of channel?

[Ryan Hamilton, 2014/06/04 22:31:15]

We could. On the other hand, the CHLO packet is padded to 1200 bytes, and it's
usually quite empty, so it's not like we're short on space. I've be inclined to
simply use the full channel string. Perhaps via GetVersionStringModifier()?

[ramant (doing other things), 2014/06/05 02:51:55]

Done.

+      break;
+    case chrome::VersionInfo::CHANNEL_DEV:
+      client_version = "D ";
+      break;
+    case chrome::VersionInfo::CHANNEL_BETA:
+      client_version = "B ";
+      break;
+    case chrome::VersionInfo::CHANNEL_STABLE:
+      client_version = "S ";
+      break;
+    default:
+      client_version = "U ";
+  }
+  chrome::VersionInfo version_info;
+  client_version.append(version_info.Version());

[Ryan Hamilton, 2014/06/04 22:31:15]

This doesn't include Chrome, right? It's just 37.0.13.4? I think we need to put
at least Chrome in here, or else we'll get collisions between different browsers
(when we have multiple browsers :>) Perhaps we should use
ProductNameAndVersionForUserAgent()?

[ramant (doing other things), 2014/06/05 02:51:55]

Done.

+  SetClientVersion(client_version);
+
   io_prefs_update_timer_.reset(
       new base::OneShotTimer<HttpServerPropertiesManager>);
 
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&HttpServerPropertiesManager::UpdateCacheFromPrefsOnUI,
                  ui_weak_ptr_));
 }
 
@@ skipping 159 matching lines @@
 
 const net::SpdySettingsMap&
 HttpServerPropertiesManager::spdy_settings_map() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return http_server_properties_impl_->spdy_settings_map();
 }
 
 void HttpServerPropertiesManager::SetServerNetworkStats(
     const net::HostPortPair& host_port_pair,
     NetworkStats stats) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   http_server_properties_impl_->SetServerNetworkStats(host_port_pair, stats);
 }
 
 const HttpServerPropertiesManager::NetworkStats*
 HttpServerPropertiesManager::GetServerNetworkStats(
     const net::HostPortPair& host_port_pair) const {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return http_server_properties_impl_->GetServerNetworkStats(host_port_pair);
 }
 
+void HttpServerPropertiesManager::SetClientVersion(
+    const std::string& client_version) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  http_server_properties_impl_->SetClientVersion(client_version);
+}
+
+const std::string HttpServerPropertiesManager::GetClientVersion() const {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  return http_server_properties_impl_->GetClientVersion();
+}
+
 //
 // Update the HttpServerPropertiesImpl's cache with data from preferences.
 //
 void HttpServerPropertiesManager::ScheduleUpdateCacheOnUI() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Cancel pending updates, if any.
   ui_cache_update_timer_->Stop();
   StartCacheUpdateTimerOnUI(
       base::TimeDelta::FromMilliseconds(kUpdateCacheDelayMs));
 }
@@ skipping 424 matching lines @@
     completion.Run();
 }
 
 void HttpServerPropertiesManager::OnHttpServerPropertiesChanged() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!setting_prefs_)
     ScheduleUpdateCacheOnUI();
 }
 
 }  // namespace chrome_browser_net