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

chrome/browser/ui/search_engines/template_url_table_model.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/ui/search_engines/template_url_table_model.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
@@ skipping 125 matching lines @@
 void TemplateURLTableModel::Reload() {
   entries_.clear();
 
   TemplateURLService::TemplateURLVector urls =
       template_url_service_->GetTemplateURLs();
 
   std::vector<std::unique_ptr<ModelEntry>> default_entries, other_entries,
       extension_entries;
   // Keywords that can be made the default first.
   for (auto* template_url : urls) {
-    // NOTE: we don't use ShowInDefaultList here to avoid items bouncing around
-    // the lists while editing.
-    if (template_url->show_in_default_list())
-      default_entries.push_back(
-          base::MakeUnique<ModelEntry>(this, template_url));
+    auto entry = base::MakeUnique<ModelEntry>(this, template_url);
+    if (template_url_service_->ShowInDefaultList(template_url))
+      default_entries.push_back(std::move(entry));
     else if (template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION)
-      extension_entries.push_back(
-          base::MakeUnique<ModelEntry>(this, template_url));
+      extension_entries.push_back(std::move(entry));
     else
-      other_entries.push_back(base::MakeUnique<ModelEntry>(this, template_url));
+      other_entries.push_back(std::move(entry));
   }
 
   last_search_engine_index_ = static_cast<int>(default_entries.size());
   last_other_engine_index_ = last_search_engine_index_ +
       static_cast<int>(other_entries.size());
 
   std::move(default_entries.begin(), default_entries.end(),
             std::back_inserter(entries_));
 
   std::move(other_entries.begin(), other_entries.end(),
@@ skipping 220 matching lines @@
 }
 
 void TemplateURLTableModel::AddEntry(int index,
                                      std::unique_ptr<ModelEntry> entry) {
   entries_.insert(entries_.begin() + index, std::move(entry));
   if (index <= last_other_engine_index_)
     ++last_other_engine_index_;
   if (observer_)
     observer_->OnItemsAdded(index, 1);
 }