Change behaivor to decide whether a search engine should be shown in the default list

chrome/browser/importer/profile_writer.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/importer/profile_writer.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <set>
@@ skipping 283 matching lines @@
 // the TemplateURLService that has a valid search url.
 static void BuildHostPathMap(TemplateURLService* model,
                              HostPathMap* host_path_map) {
   TemplateURLService::TemplateURLVector template_urls =
       model->GetTemplateURLs();
   for (size_t i = 0; i < template_urls.size(); ++i) {
     const std::string host_path = BuildHostPathKey(
         template_urls[i], model->search_terms_data(), false);
     if (!host_path.empty()) {
       const TemplateURL* existing_turl = (*host_path_map)[host_path];
-      if (!existing_turl ||
-          (template_urls[i]->show_in_default_list() &&
-           !existing_turl->show_in_default_list())) {
+      TemplateURL* t_url = template_urls[i];
+      if (!existing_turl || (model->ShowInDefaultList(t_url) &&
+                             !model->ShowInDefaultList(existing_turl))) {
         // If there are multiple TemplateURLs with the same host+path, favor
         // those shown in the default list.  If there are multiple potential
         // defaults, favor the first one, which should be the more commonly used
         // one.
-        (*host_path_map)[host_path] = template_urls[i];
+        (*host_path_map)[host_path] = t_url;
       }
     }  // else case, TemplateURL doesn't have a search url, doesn't support
        // replacement, or doesn't have valid GURL. Ignore it.
   }
 }
 
 void ProfileWriter::AddKeywords(
     TemplateURLService::OwnedTemplateURLVector template_urls,
     bool unique_on_host_and_path) {
   TemplateURLService* model =
@@ skipping 27 matching lines @@
 void ProfileWriter::AddAutofillFormDataEntries(
     const std::vector<autofill::AutofillEntry>& autofill_entries) {
   scoped_refptr<autofill::AutofillWebDataService> web_data_service =
       WebDataServiceFactory::GetAutofillWebDataForProfile(
           profile_, ServiceAccessType::EXPLICIT_ACCESS);
   if (web_data_service.get())
     web_data_service->UpdateAutofillEntries(autofill_entries);
 }
 
 ProfileWriter::~ProfileWriter() {}