Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(854)

Unified Diff: chrome/renderer/page_load_histograms.cc

Issue 12316144: Merge 183832 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/src/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/pref_names.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/page_load_histograms.cc
===================================================================
--- chrome/renderer/page_load_histograms.cc (revision 184791)
+++ chrome/renderer/page_load_histograms.cc (working copy)
@@ -321,9 +321,16 @@
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);
« no previous file with comments | « chrome/common/pref_names.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698