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

Side by Side Diff: chrome/browser/prerender/prerender_util.cc

Issue 2649903003: [Prerender] Disallow non-standard ports for Google URLs
Patch Set: cleanup Created 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prerender/prerender_util.h" 5 #include "chrome/browser/prerender/prerender_util.h"
6 6
7 #include "base/metrics/histogram_macros.h" 7 #include "base/metrics/histogram_macros.h"
8 #include "components/google/core/browser/google_util.h" 8 #include "components/google/core/browser/google_util.h"
9 #include "url/gurl.h" 9 #include "url/gurl.h"
10 10
(...skipping 18 matching lines...) Expand all
29 29
30 void ReportPrerenderSchemeCancelReason(PrerenderSchemeCancelReason reason) { 30 void ReportPrerenderSchemeCancelReason(PrerenderSchemeCancelReason reason) {
31 UMA_HISTOGRAM_ENUMERATION( 31 UMA_HISTOGRAM_ENUMERATION(
32 "Prerender.SchemeCancelReason", reason, 32 "Prerender.SchemeCancelReason", reason,
33 PRERENDER_SCHEME_CANCEL_REASON_MAX); 33 PRERENDER_SCHEME_CANCEL_REASON_MAX);
34 } 34 }
35 35
36 } // namespace 36 } // namespace
37 37
38 bool IsGoogleOriginURL(const GURL& origin_url) { 38 bool IsGoogleOriginURL(const GURL& origin_url) {
39 // ALLOW_NON_STANDARD_PORTS for integration tests with the embedded server. 39 if (!google_util::IsGoogleDomainUrl(
40 if (!google_util::IsGoogleDomainUrl(origin_url, 40 origin_url, google_util::DISALLOW_SUBDOMAIN,
41 google_util::DISALLOW_SUBDOMAIN, 41 google_util::DISALLOW_NON_STANDARD_PORTS)) {
42 google_util::ALLOW_NON_STANDARD_PORTS)) {
43 return false; 42 return false;
44 } 43 }
45 44
46 return (origin_url.path_piece() == "/") || 45 return (origin_url.path_piece() == "/") ||
47 google_util::IsGoogleSearchUrl(origin_url); 46 google_util::IsGoogleSearchUrl(origin_url);
48 } 47 }
49 48
50 void ReportPrerenderExternalURL() { 49 void ReportPrerenderExternalURL() {
51 ReportPrerenderSchemeCancelReason( 50 ReportPrerenderSchemeCancelReason(
52 PRERENDER_SCHEME_CANCEL_REASON_EXTERNAL_PROTOCOL); 51 PRERENDER_SCHEME_CANCEL_REASON_EXTERNAL_PROTOCOL);
(...skipping 19 matching lines...) Expand all
72 ReportPrerenderSchemeCancelReason( 71 ReportPrerenderSchemeCancelReason(
73 PRERENDER_SCHEME_CANCEL_REASON_CHROME_EXTENSION); 72 PRERENDER_SCHEME_CANCEL_REASON_CHROME_EXTENSION);
74 } else if (url.SchemeIs("about")) { 73 } else if (url.SchemeIs("about")) {
75 ReportPrerenderSchemeCancelReason(PRERENDER_SCHEME_CANCEL_REASON_ABOUT); 74 ReportPrerenderSchemeCancelReason(PRERENDER_SCHEME_CANCEL_REASON_ABOUT);
76 } else { 75 } else {
77 ReportPrerenderSchemeCancelReason(PRERENDER_SCHEME_CANCEL_REASON_UNKNOWN); 76 ReportPrerenderSchemeCancelReason(PRERENDER_SCHEME_CANCEL_REASON_UNKNOWN);
78 } 77 }
79 } 78 }
80 79
81 } // namespace prerender 80 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_histograms.cc ('k') | chrome/browser/prerender/prerender_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698