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

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

Issue 10264023: Revert 134625 - Transmit a X-Chrome-UMA-Enabled bit to Google domains from clients that have UMA en… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
===================================================================
--- chrome/browser/protector/protector_service.cc (revision 134639)
+++ chrome/browser/protector/protector_service.cc (working copy)
@@ -26,11 +26,8 @@
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(),
- google_util::DISALLOW_SUBDOMAIN)) {
- return google_util::IsGoogleHostname(url2.host(),
- google_util::DISALLOW_SUBDOMAIN);
- }
+ if (google_util::IsGoogleHostname(url1.host()))
+ return google_util::IsGoogleHostname(url2.host());
// Otherwise URLs must have the same domain.
return net::RegistryControlledDomainService::SameDomainOrHost(url1, url2);
}
« 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 »

Powered by Google App Engine
This is Rietveld 408576698