Merge 183832

chrome/renderer/page_load_histograms.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/renderer/page_load_histograms.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
@@ skipping 303 matching lines @@
     case DocumentState::LINK_LOAD_CACHE_ONLY:
       PLT_HISTOGRAM("PLT.BeginToFinishDoc_LinkLoadCacheOnly",
            begin_to_finish_doc);
       PLT_HISTOGRAM("PLT.BeginToFinish_LinkLoadCacheOnly",
                     begin_to_finish_all_loads);
       break;
     default:
       break;
   }
 
+  bool spdy_proxy_auth_origin_is_set = false;
+#if defined(SPDY_PROXY_AUTH_ORIGIN)
+  spdy_proxy_auth_origin_is_set = true;
+#else
+  spdy_proxy_auth_origin_is_set = CommandLine::ForCurrentProcess()->
+      HasSwitch(switches::kSpdyProxyAuthOrigin);
+#endif
+
   if (document_state->was_fetched_via_proxy() &&
-      document_state->was_fetched_via_spdy() &&
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kSpdyProxyOrigin)) {
+      document_state->was_fetched_via_spdy() && spdy_proxy_auth_origin_is_set) {
     UMA_HISTOGRAM_ENUMERATION(
         "PLT.Abandoned_SpdyProxy", abandoned_page ? 1 : 0, 2);
     PLT_HISTOGRAM("PLT.BeginToFinishDoc_SpdyProxy", begin_to_finish_doc);
     PLT_HISTOGRAM("PLT.BeginToFinish_SpdyProxy", begin_to_finish_all_loads);
   }
 
   // Histograms to determine if prefetch & prerender has an impact on PLT.
   static const bool prefetching_fieldtrial =
       base::FieldTrialList::TrialExists("Prefetch");
   if (prefetching_fieldtrial) {
@@ skipping 527 matching lines @@
 
   DCHECK(document_state);
   DCHECK(ds);
   GURL url(ds->request().url());
   Time start = document_state->start_load_time();
   Time finish = document_state->finish_load_time();
   // TODO(mbelshe): should we log more stats?
   VLOG(1) << "PLT: " << (finish - start).InMilliseconds() << "ms "
           << url.spec();
 }