Allow the default search providers to be specified by the preferences files,...

chrome/browser/search_engines/template_url_model.cc

 // Copyright (c) 2010 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/search_engines/template_url_model.h"
 
 #include "app/l10n_util.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extensions_service.h"
@@ skipping 582 matching lines @@
   // loading. Now that we've loaded we can nuke it.
   prefs_default_search_provider_.reset();
 
   // Compiler won't implicitly convert std::vector<TemplateURL*> to
   // std::vector<const TemplateURL*>, and reinterpret_cast is unsafe,
   // so we just copy it.
   std::vector<const TemplateURL*> template_urls(keyword_result.keywords.begin(),
                                                 keyword_result.keywords.end());
 
   const int resource_keyword_version =
-      TemplateURLPrepopulateData::GetDataVersion();
+      TemplateURLPrepopulateData::GetDataVersion(GetPrefs());
   if (keyword_result.builtin_keyword_version != resource_keyword_version) {
     // There should never be duplicate TemplateURLs. We had a bug such that
     // duplicate TemplateURLs existed for one locale. As such we invoke
     // RemoveDuplicatePrepopulateIDs to nuke the duplicates.
     RemoveDuplicatePrepopulateIDs(&template_urls);
   }
   SetTemplateURLs(template_urls);
 
   if (keyword_result.default_search_provider_id) {
     // See if we can find the default search provider.
@@ skipping 485 matching lines @@
 const TemplateURL* TemplateURLModel::GetTemplateURLForExtension(
     Extension* extension) const {
   for (TemplateURLVector::const_iterator i = template_urls_.begin();
        i != template_urls_.end(); ++i) {
     if ((*i)->IsExtensionKeyword() && (*i)->url()->GetHost() == extension->id())
       return *i;
   }
 
   return NULL;
 }