Make sure we check http/https to collect stats for spdy or apa....

chrome/renderer/render_view.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/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 4719 matching lines @@
   static bool use_cache_histogram1(FieldTrialList::Find("CacheSize") &&
       !FieldTrialList::Find("CacheSize")->group_name().empty());
   if (use_cache_histogram1 && NavigationState::LINK_LOAD_NORMAL <= load_type &&
       NavigationState::LINK_LOAD_CACHE_ONLY >= load_type) {
     // TODO(mbelshe): Do we really want BeginToFinishDoc here?  It seems like
     //                StartToFinish or BeginToFinish would be better.
     PLT_HISTOGRAM(FieldTrial::MakeName(
         "PLT.BeginToFinishDoc_LinkLoad", "CacheSize"), begin_to_finish_doc);
   }
 
-  // Histograms to determine if SPDY has an impact.
+
+  GURL url = GURL(main_frame->url());
+
+  // Histograms to determine if SPDY has an impact for https traffic.
   // TODO(mbelshe): After we've seen the difference between BeginToFinish
   //                and StartToFinish, consider removing one or the other.
   static bool use_spdy_histogram(FieldTrialList::Find("SpdyImpact") &&
       !FieldTrialList::Find("SpdyImpact")->group_name().empty());
-  // Spdy requests triggered by alternate protocol are excluded here.
-  // This is because when alternate protocol is avaiable, FieldTrial will
-  // either use npn_spdy or pure http, not npn_http via TLS. That will cause
-  // bias for npn_spdy and npn_http.
-  if (use_spdy_histogram && navigation_state->was_npn_negotiated() &&
-      !navigation_state->was_alternate_protocol_available()) {
+  if (use_spdy_histogram && url.SchemeIs("https") &&
+      navigation_state->was_npn_negotiated()) {
     UMA_HISTOGRAM_ENUMERATION(
         FieldTrial::MakeName("PLT.Abandoned", "SpdyImpact"),
         abandoned_page ? 1 : 0, 2);
     switch (load_type) {
       case NavigationState::LINK_LOAD_NORMAL:
         PLT_HISTOGRAM(FieldTrial::MakeName(
             "PLT.BeginToFinish_LinkLoadNormal_SpdyTrial", "SpdyImpact"),
             begin_to_finish);
         PLT_HISTOGRAM(FieldTrial::MakeName(
             "PLT.StartToFinish_LinkLoadNormal_SpdyTrial", "SpdyImpact"),
@@ skipping 11 matching lines @@
             start_to_finish);
         PLT_HISTOGRAM(FieldTrial::MakeName(
             "PLT.StartToCommit_NormalLoad_SpdyTrial", "SpdyImpact"),
             start_to_commit);
         break;
       default:
         break;
     }
   }
 
-  // Histograms to compare the impact of alternate protocol: when the
-  // protocol(spdy) is used vs. when it is ignored and http is used.
-  if (navigation_state->was_alternate_protocol_available()) {
+  // Histograms to compare the impact of alternate protocol over http traffic:
+  // when spdy is used vs. when http is used.
+  if (url.SchemeIs("http") &&
+      navigation_state->was_alternate_protocol_available()) {
     if (!navigation_state->was_npn_negotiated()) {
       // This means that even there is alternate protocols for npn_http or
       // npn_spdy, they are not taken (due to the fieldtrial).
       switch (load_type) {
         case NavigationState::LINK_LOAD_NORMAL:
           PLT_HISTOGRAM(
               "PLT.StartToFinish_LinkLoadNormal_AlternateProtocol_http",
               start_to_finish);
           PLT_HISTOGRAM(
               "PLT.StartToCommit_LinkLoadNormal_AlternateProtocol_http",
@@ skipping 28 matching lines @@
               "PLT.StartToCommit_NormalLoad_AlternateProtocol_spdy",
               start_to_commit);
           break;
         default:
           break;
       }
     }
   }
 
   // Record page load time and abandonment rates for proxy cases.
-  GURL url = GURL(main_frame->url());
   if (navigation_state->was_fetched_via_proxy()) {
     if (url.SchemeIs("https")) {
       PLT_HISTOGRAM("PLT.StartToFinish.Proxy.https", start_to_finish);
       UMA_HISTOGRAM_ENUMERATION("PLT.Abandoned.Proxy.https",
           abandoned_page ? 1 : 0, 2);
     } else {
       PLT_HISTOGRAM("PLT.StartToFinish.Proxy.http", start_to_finish);
       UMA_HISTOGRAM_ENUMERATION("PLT.Abandoned.Proxy.http",
           abandoned_page ? 1 : 0, 2);
     }
@@ skipping 358 matching lines @@
     // the origins of the two domains are different. This can be treated as a
     // top level navigation and routed back to the host.
     WebKit::WebFrame* opener = frame->opener();
     if (opener) {
       if (url.GetOrigin() != GURL(opener->url()).GetOrigin())
         return true;
     }
   }
   return false;
 }
-