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

Unified Diff: chrome/browser/protector/protector_service.cc

Issue 10108026: Transmit a X-Chrome-UMA-Enabled bit to Google domains from clients that have UMA enabled. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: MAD comment Created 8 years, 8 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
Index: chrome/browser/protector/protector_service.cc
diff --git a/chrome/browser/protector/protector_service.cc b/chrome/browser/protector/protector_service.cc
index 4b790a780ba8c917fab979c75058d26fd40c1e22..75799526c041245927f48debebc7529c7761b6e3 100644
--- a/chrome/browser/protector/protector_service.cc
+++ b/chrome/browser/protector/protector_service.cc
@@ -25,8 +25,11 @@ namespace {
bool CanMerge(const GURL& url1, const GURL& url2) {
VLOG(1) << "Checking if can merge " << url1.spec() << " with " << url2.spec();
// All Google URLs are considered the same one.
- if (google_util::IsGoogleHostname(url1.host()))
- return google_util::IsGoogleHostname(url2.host());
+ if (google_util::IsGoogleHostname(url1.host(),
+ google_util::DISALLOW_SUBDOMAIN)) {
+ return google_util::IsGoogleHostname(url2.host(),
+ google_util::DISALLOW_SUBDOMAIN);
+ }
// Otherwise URLs must have the same domain.
return net::RegistryControlledDomainService::SameDomainOrHost(url1, url2);
}

Powered by Google App Engine
This is Rietveld 408576698