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

chrome/browser/importer/firefox_importer_utils.cc

Index: chrome/browser/importer/firefox_importer_utils.cc
===================================================================
--- chrome/browser/importer/firefox_importer_utils.cc	(revision 10482)
+++ chrome/browser/importer/firefox_importer_utils.cc	(working copy)
@@ -195,14 +195,12 @@
 
   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(
@@ -218,8 +216,7 @@
         // 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),
@@ -232,8 +229,6 @@
       delete template_url;
     }
     content.clear();
-    if (need_to_increment_iter)
-      ++iter;
   }
 
   // Put the results in the |search_engines| vector.