Move Firefox importer's INI parser to c/browser/common.

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>
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/common/ini_parser.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_parser.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
@@ skipping 14 matching lines @@
       return false;
     return true;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FirefoxURLParameterFilter);
 };
 }  // namespace
 
 base::FilePath GetFirefoxProfilePath() {
-  DictionaryValue root;
   base::FilePath ini_file = GetProfilesINI();
-  ParseProfileINI(ini_file, &root);
+  std::string content;
+  file_util::ReadFileToString(ini_file, &content);
+  DictionaryValueINIParser ini_parser;
+  ini_parser.Parse(content);
+  const DictionaryValue& root = ini_parser.root();
 
   base::FilePath source_path;
   for (int i = 0; ; ++i) {
     std::string current_profile = base::StringPrintf("Profile%d", i);
     if (!root.HasKey(current_profile)) {
       // Profiles are continuously numbered. So we exit when we can't
       // find the i-th one.
       break;
     }
     std::string is_relative;
@@ skipping 57 matching lines @@
         // file, we could go straight from bytes -> filepath;
         // otherwise, we're out of luck here.
         *app_path = base::FilePath::FromWStringHack(
             UTF8ToWide(line.substr(equal + 1)));
       }
     }
   }
   return ret;
 }
 
 void ParseProfileINI(const base::FilePath& file, DictionaryValue* root) {

[Lei Zhang, 2013/06/13 21:04:30]

Don't you also need to delete this code since it's being moved?

[tommycli, 2013/06/13 23:02:03]

That's correct. I thought I deleted it, but I must have forgotten or pressed
Ctrl-Z. Done.

   // Reads the whole INI file.
   std::string content;
   file_util::ReadFileToString(file, &content);
   ReplaceSubstringsAfterOffset(&content, 0, "\r\n", "\n");
   std::vector<std::string> lines;
   base::SplitString(content, '\n', &lines);
 
   // Parses the file.
   root->Clear();
   std::string current_section;
@@ skipping 315 matching lines @@
         }
       }
     }
   }
 
   StringToLowerASCII(&branding_name);
   if (branding_name.find("iceweasel") != std::string::npos)
     return l10n_util::GetStringUTF16(IDS_IMPORT_FROM_ICEWEASEL);
   return l10n_util::GetStringUTF16(IDS_IMPORT_FROM_FIREFOX);
 }