Reland r131019: Move most TemplateURL data members to a new struct, TemplateURLData. This allows us…

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 3135 matching lines @@
   // If a version number exist in the preferences file, it overrides the
   // version of the built-in data.
   int version =
     prefs->GetInteger(prefs::kSearchProviderOverridesVersion);
   return (version >= 0) ? version : kCurrentDataVersion;
 }
 
 TemplateURL* MakePrepopulatedTemplateURL(const string16& name,
                                          const string16& keyword,
                                          const base::StringPiece& search_url,
-                                         const base::StringPiece& favicon_url,
                                          const base::StringPiece& suggest_url,
                                          const base::StringPiece& instant_url,
+                                         const base::StringPiece& favicon_url,
                                          const base::StringPiece& encoding,
                                          int id) {
-  TemplateURL* new_turl = new TemplateURL();
-  new_turl->SetURL(search_url.as_string());
-  new_turl->set_favicon_url(GURL(favicon_url.as_string()));
-  new_turl->SetSuggestionsURL(suggest_url.as_string());
-  new_turl->SetInstantURL(instant_url.as_string());
-  new_turl->set_short_name(name);
+  TemplateURLData data;
+  data.short_name = name;
   if (keyword.empty())
-    new_turl->set_autogenerate_keyword(true);
+    data.SetAutogenerateKeyword(true);
   else
-    new_turl->set_keyword(keyword);
-  new_turl->set_show_in_default_list(true);
-  new_turl->set_safe_for_autoreplace(true);
-  new_turl->set_date_created(base::Time());
-  new_turl->set_last_modified(base::Time());
-  std::vector<std::string> turl_encodings;
-  turl_encodings.push_back(encoding.as_string());
-  new_turl->set_input_encodings(turl_encodings);
-  new_turl->SetPrepopulateId(id);
-  return new_turl;
+    data.SetKeyword(keyword);
+  data.SetURL(search_url.as_string());
+  data.suggestions_url = suggest_url.as_string();
+  data.instant_url = instant_url.as_string();
+  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(data);
 }
 
 void GetPrepopulatedTemplateFromPrefs(PrefService* prefs,
                                       std::vector<TemplateURL*>* t_urls) {
   if (!prefs)
     return;
 
   const ListValue* list =
       prefs->GetList(prefs::kSearchProviderOverrides);
   if (!list)
@@ skipping 23 matching lines @@
         engine->Get("id", &val) && val->GetAsInteger(&id)) {
       // These next fields are not allowed to be empty.
       if (name.empty() || search_url.empty() || favicon_url.empty() ||
           encoding.empty())
         return;
     } else {
       // Got a parsing error. No big deal.
       continue;
     }
     t_urls->push_back(MakePrepopulatedTemplateURL(name, keyword, search_url,
-        favicon_url, suggest_url, instant_url, encoding, id));
+        suggest_url, instant_url, favicon_url, encoding, id));
   }
 }
 
 // The caller owns the returned TemplateURL.
 TemplateURL* MakePrepopulatedTemplateURLFromPrepopulateEngine(
     const PrepopulatedEngine& engine) {
   return MakePrepopulatedTemplateURL(WideToUTF16(engine.name),
-      WideToUTF16(engine.keyword), engine.search_url, engine.favicon_url,
-      engine.suggest_url, engine.instant_url, engine.encoding, engine.id);
+      WideToUTF16(engine.keyword), engine.search_url, engine.suggest_url,
+      engine.instant_url, engine.favicon_url, engine.encoding, engine.id);
 }
 
 void GetPrepopulatedEngines(PrefService* prefs,
                             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(prefs, t_urls);
   if (!t_urls->empty())
@@ skipping 63 matching lines @@
       UTF8ToUTF16(as_gurl.host()) :
       l10n_util::GetStringUTF16(IDS_UNKNOWN_SEARCH_ENGINE_NAME);
 }
 
 SearchEngineType GetEngineType(const std::string& url) {
   const PrepopulatedEngine* engine = GetEngineForURL(url);
   return engine ? engine->type : SEARCH_ENGINE_OTHER;
 }
 
 }  // namespace TemplateURLPrepopulateData