Cache SearchEngineType of TemplateURL

components/search_engines/desktop_search_utils.cc

 // Copyright 2016 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 "components/search_engines/desktop_search_utils.h"
 
 #include <memory>
 #include <string>
 
 #include "base/metrics/histogram_macros.h"
@@ skipping 95 matching lines @@
   if (!base::FeatureList::IsEnabled(kDesktopSearchRedirectionFeature)) {
     RecordDesktopSearchURLAction(
         DESKTOP_SEARCH_URL_ACTION_NO_REDIRECTION_FEATURE_DISABLED);
     return false;
   }
 
   // Check if the default search engine is Bing.
   const TemplateURL* default_search_engine =
       template_url_service->GetDefaultSearchProvider();
   if (default_search_engine &&
-      TemplateURLPrepopulateData::GetEngineType(
-          *default_search_engine, template_url_service->search_terms_data()) ==
+      default_search_engine->GetEngineType(
+          template_url_service->search_terms_data()) ==
           SEARCH_ENGINE_BING) {
     RecordDesktopSearchURLAction(
         DESKTOP_SEARCH_URL_ACTION_NO_REDIRECTION_DEFAULT_SEARCH_IS_BING);
     return false;
   }
 
   // Replace |url| by a default search engine URL.
   GURL search_url(
       GetDefaultSearchURLForSearchTerms(template_url_service, search_terms));
   if (!search_url.is_valid()) {
     RecordDesktopSearchURLAction(
         DESKTOP_SEARCH_URL_ACTION_NO_REDIRECTION_INVALID_SEARCH_ENGINE);
     return false;
   }
 
   RecordDesktopSearchURLAction(DESKTOP_SEARCH_URL_ACTION_REDIRECTION);
 
   url->Swap(&search_url);
   return !pref_service->GetBoolean(
       prefs::kDesktopSearchRedirectionInfobarShownPref);
 }