Clean up TemplateURL prepopulate data:

chrome/browser/protector/histograms.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/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"
 
 namespace protector {
 
 const char kProtectorHistogramDefaultSearchProvider[] =
     "Protector.DefaultSearchProvider";
 
 const char kProtectorHistogramSearchProviderApplied[] =
     "Protector.SearchProvider.Applied";
@@ skipping 16 matching lines @@
     "Protector.StartupSettings.Applied";
 const char kProtectorHistogramStartupSettingsChanged[] =
     "Protector.StartupSettings.Changed";
 const char kProtectorHistogramStartupSettingsDiscarded[] =
     "Protector.StartupSettings.Discarded";
 const char kProtectorHistogramStartupSettingsTimeout[] =
     "Protector.StartupSettings.Timeout";
 
 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 ?

[sky, 2012/03/14 21:18:05]

You sure you don't need the && t_url->url() here too?

[Peter Kasting, 2012/03/14 21:21:35]

I do need it -- removing it is a change that will come in a later refactoring
step.  Thanks!

+      TemplateURLPrepopulateData::GetEngineType(t_url->url()->url()) :
+      SEARCH_ENGINE_NONE;
 }
 
 }  // namespace protector