Perform ClientHello padding if the field trial is enabled

net/socket/ssl_client_socket_pool.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 "net/socket/ssl_client_socket_pool.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
@@ skipping 458 matching lines @@
       ssl_socket_->set_was_spdy_negotiated(true);
     }
   }
   if (params_->want_spdy_over_npn() && !ssl_socket_->was_spdy_negotiated())
     return ERR_NPN_NEGOTIATION_FAILED;
 
   // Spdy might be turned on by default, or it might be over npn.
   bool using_spdy = params_->force_spdy_over_ssl() ||
       params_->want_spdy_over_npn();
 
+  const std::string& host = params_->host_and_port().host();
+  bool is_google =
+      host == "google.com" ||
+      (host.size() > 11 && host.rfind(".google.com") == host.size() - 11);

[Alexei Svitkine (slow), 2015/02/06 22:44:01]

Can this use google_util::IsGoogleHostname() too?

[jeremyim, 2015/02/06 22:47:22]

Unfortunately, I believe that's a layering violation (since google_util lives in
components). =\

[Ryan Sleevi, 2015/02/07 00:20:56]

Correct.

I mean, this is a layering violation as it is (//net shouldn't have
Google-specific logic), so the new dependency on it Not LGTM.

[jeremyim, 2015/02/07 03:24:29]

This change has been reverted. Back to using 2 booleans in SSL_Config (with
comments) indicating when fastradio_padding is turned on, and UMA should be
logged (but fastradio_padding is not turned on).

   if (result == OK ||
       ssl_socket_->IgnoreCertError(result, params_->load_flags())) {
     DCHECK(!connect_timing_.ssl_start.is_null());
     base::TimeDelta connect_duration =
         connect_timing_.ssl_end - connect_timing_.ssl_start;
     if (using_spdy) {
       UMA_HISTOGRAM_CUSTOM_TIMES("Net.SpdyConnectionLatency_2",
                                  connect_duration,
                                  base::TimeDelta::FromMilliseconds(1),
                                  base::TimeDelta::FromMinutes(1),
@@ skipping 25 matching lines @@
                                  base::TimeDelta::FromMinutes(1),
                                  100);
     } else if (ssl_info.handshake_type == SSLInfo::HANDSHAKE_FULL) {
       UMA_HISTOGRAM_CUSTOM_TIMES("Net.SSL_Connection_Latency_Full_Handshake",
                                  connect_duration,
                                  base::TimeDelta::FromMilliseconds(1),
                                  base::TimeDelta::FromMinutes(1),
                                  100);
     }
 
-    const std::string& host = params_->host_and_port().host();
-    bool is_google =
-        host == "google.com" ||
-        (host.size() > 11 && host.rfind(".google.com") == host.size() - 11);
     if (is_google) {
       UMA_HISTOGRAM_CUSTOM_TIMES("Net.SSL_Connection_Latency_Google2",
                                  connect_duration,
                                  base::TimeDelta::FromMilliseconds(1),
                                  base::TimeDelta::FromMinutes(1),
                                  100);
       if (ssl_info.handshake_type == SSLInfo::HANDSHAKE_RESUME) {
         UMA_HISTOGRAM_CUSTOM_TIMES("Net.SSL_Connection_Latency_Google_"
                                        "Resume_Handshake",
                                    connect_duration,
@@ skipping 12 matching lines @@
   }
 
   if (result == OK || IsCertificateError(result)) {
     SetSocket(ssl_socket_.Pass());
   } else if (result == ERR_SSL_CLIENT_AUTH_CERT_NEEDED) {
     error_response_info_.cert_request_info = new SSLCertRequestInfo;
     ssl_socket_->GetSSLCertRequestInfo(
         error_response_info_.cert_request_info.get());
   }
 
+  UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_Connection_Error", std::abs(result));
+  if (is_google) {
+    UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_Connection_Error_Google",
+                                std::abs(result));
+  }
+
   return result;
 }
 
 void SSLConnectJob::ResumeSSLConnection() {
   DCHECK_EQ(next_state_, STATE_SSL_CONNECT);
   messenger_ = NULL;
   OnIOComplete(OK);
 }
 
 SSLConnectJob::State SSLConnectJob::GetInitialState(
@@ skipping 269 matching lines @@
   CHECK(it != messenger_map_.end());
   delete it->second;
   messenger_map_.erase(it);
 }
 
 void SSLClientSocketPool::OnSSLConfigChanged() {
   FlushWithError(ERR_NETWORK_CHANGED);
 }
 
 }  // namespace net