Revert change made in http://codereview.chromium.org/10925....

chrome/browser/importer/firefox_importer_utils.cc

 // Copyright (c) 2006-2008 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 <shlobj.h>
 
 #include "base/file_util.h"
@@ skipping 177 matching lines @@
 
   return true;
 }
 
 void ParseSearchEnginesFromXMLFiles(const std::vector<std::wstring>& xml_files,
                                     std::vector<TemplateURL*>* search_engines) {
   DCHECK(search_engines);
 
   std::map<std::wstring, TemplateURL*> search_engine_for_url;
   std::string content;
-  bool need_to_increment_iter;
   // The first XML file represents the default search engine in Firefox 3, so we
   // need to keep it on top of the list.
   TemplateURL* default_turl = NULL;
-  for (std::vector<std::wstring>::const_iterator iter = xml_files.begin();
-       iter != xml_files.end();) {
-    need_to_increment_iter = true;
-    file_util::ReadFileToString(*iter, &content);
+  for (std::vector<std::wstring>::const_iterator file_iter = xml_files.begin();
+       file_iter != xml_files.end(); ++file_iter) {
+    file_util::ReadFileToString(*file_iter, &content);
     TemplateURL* template_url = new TemplateURL();
     FirefoxURLParameterFilter param_filter;
     if (TemplateURLParser::Parse(
         reinterpret_cast<const unsigned char*>(content.data()),
         content.length(), &param_filter, template_url) &&
         template_url->url()) {
       std::wstring url = template_url->url()->url();
       std::map<std::wstring, TemplateURL*>::iterator iter =
           search_engine_for_url.find(url);
       if (iter != search_engine_for_url.end()) {
         // 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 = search_engine_for_url.erase(iter);
-        need_to_increment_iter = false;
+        search_engine_for_url.erase(iter);
       }
       // Give this a keyword to facilitate tab-to-search, if possible.
       template_url->set_keyword(TemplateURLModel::GenerateKeyword(GURL(url),
                                                                   false));
       template_url->set_show_in_default_list(true);
       search_engine_for_url[url] = template_url;
       if (!default_turl)
         default_turl = template_url;
     } else {
       delete template_url;
     }
     content.clear();
-    if (need_to_increment_iter)
-      ++iter;
   }
 
   // Put the results in the |search_engines| vector.
   std::map<std::wstring, TemplateURL*>::iterator t_iter;
   for (t_iter = search_engine_for_url.begin();
        t_iter != search_engine_for_url.end(); ++t_iter) {
     if (t_iter->second == default_turl)
       search_engines->insert(search_engines->begin(), default_turl);
     else
       search_engines->push_back(t_iter->second);
@@ skipping 486 matching lines @@
       // Version 3 has an extra line for further use.
       if (version == 3) {
         ++begin;
       }
 
       forms->push_back(form);
     }
   }
 }