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

chrome/browser/search_engines/template_url_prepopulate_data.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/search_engines/template_url_prepopulate_data.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <locale.h>
 #endif
 
@@ skipping 3266 matching lines @@
     // and thus won't ever string-compare successfully against |url|.
     return (url == google.search_url) ? &google : NULL;
   }
 
   // For all other cases, check using origins, in order to more aggressively
   // match search engine types for data imported from other browsers.
   //
   // First special-case Google, because the prepopulate URL for it will not
   // convert to a GURL and thus won't have an origin.  Instead see if the
   // incoming URL's host is "[*.]google.<TLD>".
-  if (google_util::IsGoogleHostname(as_gurl.host(),
-                                    google_util::DISALLOW_SUBDOMAIN))
+  if (google_util::IsGoogleHostname(as_gurl.host()))
     return &google;
 
   // Now check the rest of the prepopulate data.
   GURL origin(as_gurl.GetOrigin());
   for (size_t i = 0; i < arraysize(kAllEngines); ++i) {
     GURL engine_url(kAllEngines[i]->search_url);
     if (engine_url.is_valid() && (origin == engine_url.GetOrigin()))
       return kAllEngines[i];
   }
 
   return NULL;
 }
 
 string16 GetEngineName(const std::string& url) {
   const PrepopulatedEngine* engine = GetEngineForURL(url);
   if (engine)
     return WideToUTF16(engine->name);
   GURL as_gurl(url);
   return (as_gurl.is_valid() && !as_gurl.host().empty()) ?
       UTF8ToUTF16(as_gurl.host()) :
       l10n_util::GetStringUTF16(IDS_UNKNOWN_SEARCH_ENGINE_NAME);
 }
 
 SearchEngineType GetEngineType(const std::string& url) {
   const PrepopulatedEngine* engine = GetEngineForURL(url);
   return engine ? engine->type : SEARCH_ENGINE_OTHER;
 }
 
 }  // namespace TemplateURLPrepopulateData