Add new search engine logos to template url data. This CL also reorganizes the way logos and search engine type data are stored. Because the search engine dialog is no longer an experiment running on few locales, move the data and logos into the template_url_prepopulate_data for each search engine.

BUG=42612
TEST=search engine dialog works as expected.

Review URL: http://codereview.chromium.org/3040022

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

1 files changed, 3 insertions, 6 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 1d319b8..3955084 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -1240,8 +1240,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
     if (master_prefs.run_search_engine_experiment) {
       UMA_HISTOGRAM_ENUMERATION(
           "Chrome.SearchSelectExperiment",
-          TemplateURLPrepopulateData::GetSearchEngineType(
-          default_search_engine),
+          default_search_engine->search_engine_type(),
           TemplateURLPrepopulateData::SEARCH_ENGINE_MAX);
       // If the selection has been randomized, also record the winner by slot.
       if (master_prefs.randomize_search_engine_experiment) {
@@ -1253,8 +1252,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
           experiment_type.push_back('1' + engine_pos);
           UMA_HISTOGRAM_ENUMERATION(
               experiment_type,
-              TemplateURLPrepopulateData::GetSearchEngineType(
-              default_search_engine),
+              default_search_engine->search_engine_type(),
               TemplateURLPrepopulateData::SEARCH_ENGINE_MAX);
         } else {
           NOTREACHED() << "Invalid search engine selection slot.";
@@ -1263,8 +1261,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
     } else {
       UMA_HISTOGRAM_ENUMERATION(
           "Chrome.SearchSelectExempt",
-          TemplateURLPrepopulateData::GetSearchEngineType(
-              default_search_engine),
+          default_search_engine->search_engine_type(),
           TemplateURLPrepopulateData::SEARCH_ENGINE_MAX);
     }
   }