Revert 134625 - Transmit a X-Chrome-UMA-Enabled bit to Google domains from clients that have UMA en…

chrome/browser/protector/protector_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/protector/protector_service.h"
 
 #include "base/logging.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/protector/composite_settings_change.h"
 #include "chrome/browser/protector/keys.h"
 #include "chrome/browser/protector/protected_prefs_watcher.h"
 #include "chrome/browser/protector/protector_utils.h"
 #include "chrome/browser/protector/settings_change_global_error.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_source.h"
 #include "net/base/registry_controlled_domain.h"
 
 namespace protector {
 
 namespace {
 
 // Returns true if changes with URLs |url1| and |url2| can be merged.
 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);
 }
 
 }  // namespace
 
 ProtectorService::ProtectorService(Profile* profile)
     : profile_(profile),
       has_active_change_(false) {
   // Start observing pref changes.
@@ skipping 171 matching lines @@
 ProtectorService::MatchItemByError::MatchItemByError(
     const SettingsChangeGlobalError* other) : other_(other) {
 }
 
 bool ProtectorService::MatchItemByError::operator()(
     const ProtectorService::Item& item) {
   return other_ == item.error.get();
 }
 
 }  // namespace protector