Pass chrome version and channel in CHLO message to server.

chrome/browser/io_thread.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/io_thread.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 21 matching lines @@
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/connect_interceptor.h"
 #include "chrome/browser/net/dns_probe_service.h"
 #include "chrome/browser/net/pref_proxy_config_tracker.h"
 #include "chrome/browser/net/proxy_service_factory.h"
 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_prefs.h"
 #include "components/data_reduction_proxy/browser/http_auth_handler_data_reduction_proxy.h"
 #include "components/policy/core/common/policy_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "net/base/host_mapping_rules.h"
 #include "net/base/net_util.h"
 #include "net/base/sdch_manager.h"
 #include "net/cert/cert_verifier.h"
@@ skipping 917 matching lines @@
   globals_->enable_quic_https.CopyToIfSet(&params->enable_quic_https);
   globals_->enable_quic_pacing.CopyToIfSet(
       &params->enable_quic_pacing);
   globals_->enable_quic_time_based_loss_detection.CopyToIfSet(
       &params->enable_quic_time_based_loss_detection);
   globals_->enable_quic_persist_server_info.CopyToIfSet(
       &params->enable_quic_persist_server_info);
   globals_->enable_quic_port_selection.CopyToIfSet(
       &params->enable_quic_port_selection);
   globals_->quic_max_packet_length.CopyToIfSet(&params->quic_max_packet_length);
+  globals_->client_version.CopyToIfSet(&params->client_version);
   globals_->quic_supported_versions.CopyToIfSet(
       &params->quic_supported_versions);
   globals_->origin_to_force_quic_on.CopyToIfSet(
       &params->origin_to_force_quic_on);
   params->enable_user_alternate_protocol_ports =
       globals_->enable_user_alternate_protocol_ports;
 }
 
 base::TimeTicks IOThread::creation_time() const {
   return creation_time_;
@@ skipping 86 matching lines @@
     globals_->enable_quic_port_selection.set(
         ShouldEnableQuicPortSelection(command_line));
   }
 
   size_t max_packet_length = GetQuicMaxPacketLength(command_line,
                                                     quic_trial_group);
   if (max_packet_length != 0) {
     globals_->quic_max_packet_length.set(max_packet_length);
   }
 
+  std::string client_version =
+      chrome::VersionInfo::GetVersionStringModifier();
+  chrome::VersionInfo version_info;

[Lei Zhang, 2014/06/05 07:30:47]

nit: swap with the next line to put |version_info| closer to where it's used.

[ramant (doing other things), 2014/06/05 17:07:49]

Done.

+  client_version.append(" ");

[Lei Zhang, 2014/06/05 07:30:47]

nit: append(" ") -> push_back(' ')

[ramant (doing other things), 2014/06/05 17:07:49]

Done.

+  client_version.append(version_info.ProductNameAndVersionForUserAgent());
+  globals_->client_version.set(client_version);
+
   net::QuicVersion version = GetQuicVersion(command_line);
   if (version != net::QUIC_VERSION_UNSUPPORTED) {
     net::QuicVersionVector supported_versions;
     supported_versions.push_back(version);
     globals_->quic_supported_versions.set(supported_versions);
   }
 
   if (command_line.HasSwitch(switches::kOriginToForceQuicOn)) {
     net::HostPortPair quic_origin =
         net::HostPortPair::FromString(
@@ skipping 109 matching lines @@
   std::string version_flag =
       command_line.GetSwitchValueASCII(switches::kQuicVersion);
   for (size_t i = 0; i < supported_versions.size(); ++i) {
     net::QuicVersion version = supported_versions[i];
     if (net::QuicVersionToString(version) == version_flag) {
       return version;
     }
   }
   return net::QUIC_VERSION_UNSUPPORTED;
 }