chrome/browser/protector/protector_service.cc - Issue 10108026: Transmit a X-Chrome-UMA-Enabled bit to Google domains from clients that have UMA enabled.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: merge to tot 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

« no previous file with comments | « chrome/browser/profiles/profile_io_data.cc ('k') | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/protector/protector_service.cc

diff --git a/chrome/browser/protector/protector_service.cc b/chrome/browser/protector/protector_service.cc

index b895e68190f18c20c58557f2e3ecfba52679da68..a2b34fb1c691472f70cd708e9f4e1b646f5ae6da 100644

--- a/chrome/browser/protector/protector_service.cc

+++ b/chrome/browser/protector/protector_service.cc

@@ -26,8 +26,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);

}