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

chrome/browser/importer/firefox_importer_utils.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/importer/firefox_importer_utils.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 182 matching lines @@
   typedef std::map<std::string, TemplateURL*> SearchEnginesMap;
   SearchEnginesMap search_engine_for_url;
   std::string content;
   // The first XML file represents the default search engine in Firefox 3, so we
   // need to keep it on top of the list.
   SearchEnginesMap::const_iterator default_turl = search_engine_for_url.end();
   for (std::vector<FilePath>::const_iterator file_iter = xml_files.begin();
        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());
       if (iter == search_engine_for_url.end()) {
         iter = search_engine_for_url.insert(
             std::make_pair(template_url->url(), template_url)).first;
       } else {
         // We have already found a search engine with the same URL.  We give
         // priority to the latest one found, as GetSearchEnginesXMLFiles()
         // returns a vector with first Firefox default search engines and then
         // the user's ones.  We want to give priority to the user ones.
         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;
     }
     content.clear();
   }
 
   // Put the results in the |search_engines| vector.
   for (SearchEnginesMap::iterator t_iter = search_engine_for_url.begin();
        t_iter != search_engine_for_url.end(); ++t_iter) {
     if (t_iter == default_turl)
@@ skipping 181 matching lines @@
   }
 
   // String values have double quotes we don't need to return to the caller.
   if (content[start] == '\"' && content[stop - 1] == '\"') {
     ++start;
     --stop;
   }
 
   return content.substr(start, stop - start);
 }