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); |
} |