Clean up TemplateURL prepopulate data:

* Replace a pair of overlapping functions in the API with two distinct accessors for relevant pieces of information about prepopulated URLs. One key side effect here is that we no longer return TemplateURL*s from these, which will make the upcoming refactoring changes slightly cleaner. 
* Make the implementation of these a bit more robust w.r.t. determining if a provided URL corresponds to Google. This will also be important later as we'll want to be able to match a hand-coded "google.co.uk" entry against an auto-generated "google.de" entry (or similar). 
* Remove a bunch of string conversions, as well as a lot of passing of raw C-style string pointers. 
* Remove using statements. 
* Remove two obscure engines which have the same hostname as another, different engine. These cause problems when we ask for the name or type of an engine because the answer we get back is basically indeterminate. I don't think either of these is very important (they lived at slots 4 and 5 in their respective countries) so just gut them. 

BUG=none 
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9705021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126746 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 11 deletions

diff --git a/chrome/browser/protector/histograms.cc b/chrome/browser/protector/histograms.cc
index 1b5c3e2..2be23e2 100644
--- a/chrome/browser/protector/histograms.cc
+++ b/chrome/browser/protector/histograms.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/protector/histograms.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/search_engines/search_engine_type.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 
@@ -42,16 +41,10 @@ const char kProtectorHistogramStartupSettingsTimeout[] =
 
 const int kProtectorMaxSearchProviderID = SEARCH_ENGINE_MAX;
 
-int GetSearchProviderHistogramID(const TemplateURL* turl) {
-  if (!turl || !turl->url())
-    return SEARCH_ENGINE_NONE;
-  scoped_ptr<TemplateURL> prepopulated_url(
-      TemplateURLPrepopulateData::FindPrepopulatedEngine(turl->url()->url()));
-  if (prepopulated_url.get())
-    return static_cast<int>(prepopulated_url->search_engine_type());
-  // If |turl| is not among the prepopulated providers, return
-  // SEARCH_ENGINE_OTHER as well.
-  return SEARCH_ENGINE_OTHER;
+int GetSearchProviderHistogramID(const TemplateURL* t_url) {
+  return (t_url && t_url->url()) ?
+      TemplateURLPrepopulateData::GetEngineType(t_url->url()->url()) :
+      SEARCH_ENGINE_NONE;
 }
 
 }  // namespace protector