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

chrome/browser/ui/search_engines/search_engine_tab_helper.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/search_engine_tab_helper.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_fetcher_factory.h"
@@ skipping 153 matching lines @@
 
   if (current_url) {
     if (current_url->originating_url().is_valid()) {
       // The existing keyword was generated from an OpenSearch description
       // document, don't regenerate.
       return;
     }
     url_service->Remove(current_url);
   }
 
-  TemplateURL* new_url = new TemplateURL();
-  new_url->set_short_name(keyword);
-  new_url->set_keyword(keyword);
-  new_url->set_safe_for_autoreplace(true);
-  new_url->add_input_encoding(params.searchable_form_encoding);
+  TemplateURLData data;
+  data.short_name = keyword;
+  data.SetKeyword(keyword);
+  data.SetURL(url.spec());
   DCHECK(controller.GetLastCommittedEntry());
   const GURL& current_favicon =
       controller.GetLastCommittedEntry()->GetFavicon().url;
   // If the favicon url isn't valid, it means there really isn't a favicon, or
   // the favicon url wasn't obtained before the load started. This assumes the
   // latter.
   // TODO(sky): Need a way to set the favicon that doesn't involve generating
   // its url.
-  const GURL& favicon_url = current_favicon.is_valid() ?
+  data.favicon_url = current_favicon.is_valid() ?
       current_favicon : TemplateURL::GenerateFaviconURL(params.referrer.url);
-  new_url->SetURL(url.spec());
-  new_url->set_favicon_url(favicon_url);
-  url_service->Add(new_url);
+  data.safe_for_autoreplace = true;
+  data.input_encodings.push_back(params.searchable_form_encoding);
+  url_service->Add(new TemplateURL(data));
 }