Move the URL string from TemplateURLRef onto the owning TemplateURL. This will make it easier to m…

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 185 matching lines @@
   // 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);
     if (template_url) {
-      std::string url = template_url->url()->url();
+      std::string url(template_url->url());

[sky, 2012/03/30 16:45:14]

const std::string&

       SearchEnginesMap::iterator iter = search_engine_for_url.find(url);
       if (iter == search_engine_for_url.end()) {
         iter = search_engine_for_url.insert(
             std::make_pair(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;
@@ skipping 194 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);
 }