Move most TemplateURL data members to a new struct, TemplateURLData. This allows us to eliminate t…

chrome/browser/importer/firefox2_importer.cc

Index: chrome/browser/importer/firefox2_importer.cc
===================================================================
--- chrome/browser/importer/firefox2_importer.cc	(revision 130759)
+++ chrome/browser/importer/firefox2_importer.cc	(working copy)
@@ -134,13 +134,13 @@
   if (keyword.empty() || !url.is_valid())
     return NULL;
 
-  TemplateURL* t_url = new TemplateURL();
+  TemplateURLData data;
   // We set short name by using the title if it exists.
   // Otherwise, we use the shortcut.
-  t_url->set_short_name(title.empty() ? keyword : title);
-  t_url->set_keyword(keyword);
-  t_url->SetURL(TemplateURLRef::DisplayURLToURLRef(UTF8ToUTF16(url.spec())));
-  return t_url;
+  data.short_name = title.empty() ? keyword : title;
+  data.SetKeyword(keyword);
+  data.SetURL(TemplateURLRef::DisplayURLToURLRef(UTF8ToUTF16(url.spec())));
+  return new TemplateURL(data);
 }
 
 // static