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

chrome/browser/importer/firefox_importer_utils.cc

Index: chrome/browser/importer/firefox_importer_utils.cc
===================================================================
--- chrome/browser/importer/firefox_importer_utils.cc	(revision 131175)
+++ chrome/browser/importer/firefox_importer_utils.cc	(working copy)
@@ -200,8 +200,8 @@
        file_iter != xml_files.end(); ++file_iter) {
     file_util::ReadFileToString(*file_iter, &content);
     FirefoxURLParameterFilter param_filter;
-    TemplateURL* template_url = TemplateURLParser::Parse(NULL, content.data(),
-        content.length(), &param_filter);
+    TemplateURL* template_url = TemplateURLParser::Parse(NULL, true,
+        content.data(), content.length(), &param_filter);
     if (template_url) {
       SearchEnginesMap::iterator iter =
           search_engine_for_url.find(template_url->url());
@@ -216,7 +216,6 @@
         delete iter->second;
         iter->second = template_url;
       }
-      iter->second->set_show_in_default_list(true);
       if (default_turl == search_engine_for_url.end())
         default_turl = iter;
     }