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

chrome/browser/importer/ie_importer.cc

Index: chrome/browser/importer/ie_importer.cc
===================================================================
--- chrome/browser/importer/ie_importer.cc	(revision 131175)
+++ chrome/browser/importer/ie_importer.cc	(working copy)
@@ -584,14 +584,13 @@
       // First time we see that URL.
       GURL gurl(url);
       if (gurl.is_valid()) {
-        TemplateURL* template_url = new TemplateURL();
-        template_url->set_short_name(name);
-        template_url->SetURL(url);
-        // Give this a keyword to facilitate tab-to-search, if possible.
-        template_url->set_keyword(TemplateURLService::GenerateKeyword(gurl,
-                                                                      false));
-        template_url->set_show_in_default_list(true);
-        search_engines_map.insert(std::make_pair(url, template_url));
+        TemplateURLData data;
+        data.short_name = name;
+        data.SetKeyword(TemplateURLService::GenerateKeyword(gurl, false));
+        data.SetURL(url);
+        data.show_in_default_list = true;
+        t_iter = search_engines_map.insert(std::make_pair(url,
+            new TemplateURL(data))).first;
       }
     }
   }