Add search_terms_replacement_key field to TemplateURL.

chrome/browser/search_engines/template_url_prepopulate_data.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/search_engines/template_url_prepopulate_data.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <locale.h>
 #endif
 
@@ skipping 1092 matching lines @@
                              PrefService::UNSYNCABLE_PREF);
 }
 
 int GetDataVersion(PrefService* prefs) {
   // Allow tests to override the local version.
   return (prefs && prefs->HasPrefPath(prefs::kSearchProviderOverridesVersion)) ?
       prefs->GetInteger(prefs::kSearchProviderOverridesVersion) :
       kCurrentDataVersion;
 }
 
-TemplateURL* MakePrepopulatedTemplateURL(Profile* profile,
-                                         const string16& name,
-                                         const string16& keyword,
-                                         const base::StringPiece& search_url,
-                                         const base::StringPiece& suggest_url,
-                                         const base::StringPiece& instant_url,
-                                         const ListValue& alternate_urls,
-                                         const base::StringPiece& favicon_url,
-                                         const base::StringPiece& encoding,
-                                         int id) {
+TemplateURL* MakePrepopulatedTemplateURL(
+    Profile* profile,
+    const string16& name,
+    const string16& keyword,
+    const base::StringPiece& search_url,
+    const base::StringPiece& suggest_url,
+    const base::StringPiece& instant_url,
+    const ListValue& alternate_urls,
+    const base::StringPiece& search_terms_replacement_key,
+    const base::StringPiece& favicon_url,
+    const base::StringPiece& encoding,
+    int id) {
 
   TemplateURLData data;
 
   data.short_name = name;
   data.SetKeyword(keyword);
   data.SetURL(search_url.as_string());
   data.suggestions_url = suggest_url.as_string();
   data.instant_url = instant_url.as_string();
   for (size_t i = 0; i < alternate_urls.GetSize(); ++i) {
     std::string alternate_url;
     alternate_urls.GetString(i, &alternate_url);
     DCHECK(!alternate_url.empty());
     data.alternate_urls.push_back(alternate_url);
   }
+  data.search_terms_replacement_key = search_terms_replacement_key.as_string();

[Peter Kasting, 2012/12/18 01:54:43]

Nit: Set this member in the same order that the TempalteURLData members were
declared.  Also make the function argument order match.  And similar comments
everywhere else this parameter/member appears alongside others.

[beaudoin, 2012/12/20 04:23:29]

Fixed alternate_urls at the same time.

Done.

   data.favicon_url = GURL(favicon_url.as_string());
   data.show_in_default_list = true;
   data.safe_for_autoreplace = true;
   data.input_encodings.push_back(encoding.as_string());
   data.date_created = base::Time();
   data.last_modified = base::Time();
   data.prepopulate_id = id;
   return new TemplateURL(profile, data);
 }
 
@@ skipping 21 matching lines @@
         engine->GetString("name", &name) && !name.empty() &&
         engine->GetString("keyword", &keyword) && !keyword.empty() &&
         engine->GetString("search_url", &search_url) && !search_url.empty() &&
         engine->GetString("favicon_url", &favicon_url) &&
         !favicon_url.empty() &&
         engine->GetString("encoding", &encoding) && !encoding.empty() &&
         engine->GetInteger("id", &id)) {
       // These fields are optional.
       std::string suggest_url;
       std::string instant_url;
+      std::string search_terms_replacement_key;
       ListValue empty_list;
       const ListValue* alternate_urls = &empty_list;
       engine->GetString("suggest_url", &suggest_url);
       engine->GetString("instant_url", &instant_url);
       engine->GetList("alternate_urls", &alternate_urls);
+      engine->GetString("search_terms_replacement_key",
+          &search_terms_replacement_key);
       t_urls->push_back(MakePrepopulatedTemplateURL(profile, name, keyword,
-          search_url, suggest_url, instant_url, *alternate_urls, favicon_url,
-          encoding, id));
+          search_url, suggest_url, instant_url, *alternate_urls,
+          search_terms_replacement_key, favicon_url, encoding, id));
     }
   }
 }
 
 // The caller owns the returned TemplateURL.
 TemplateURL* MakePrepopulatedTemplateURLFromPrepopulateEngine(
     Profile* profile,
     const PrepopulatedEngine& engine) {
 
   ListValue alternate_urls;
   if (engine.alternate_urls) {
     for (size_t i = 0; i < engine.alternate_urls_size; ++i)
       alternate_urls.AppendString(std::string(engine.alternate_urls[i]));
   }
 
   return MakePrepopulatedTemplateURL(profile, WideToUTF16(engine.name),
       WideToUTF16(engine.keyword), engine.search_url, engine.suggest_url,
-      engine.instant_url, alternate_urls,
+      engine.instant_url, alternate_urls, engine.search_terms_replacement_key,
       engine.favicon_url, engine.encoding, engine.id);
 }
 
 void GetPrepopulatedEngines(Profile* profile,
                             std::vector<TemplateURL*>* t_urls,
                             size_t* default_search_provider_index) {
   // If there is a set of search engines in the preferences file, it overrides
   // the built-in set.
   *default_search_provider_index = 0;
   GetPrepopulatedTemplateFromPrefs(profile, t_urls);
@@ skipping 67 matching lines @@
 GURL GetLogoURL(const TemplateURL& template_url, LogoSize size) {
   if (GetEngineType(template_url.url()) == SEARCH_ENGINE_GOOGLE) {
     return GURL((size == LOGO_200_PERCENT) ?
                 google_logos.logo_200_percent_url :
                 google_logos.logo_100_percent_url);
   }
   return GURL();
 }
 
 }  // namespace TemplateURLPrepopulateData