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

base/ini_parser.cc

+// Copyright 2013 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 "base/ini_parser.h"
+
+#include "base/strings/string_tokenizer.h"
+
+namespace base {
+
+INIParser::INIParser() {}

[Mark Mentovai, 2013/06/17 18:52:37]

Why {} here but on separate lines for the destructor and for the other class? Be
consistent.

[tommycli, 2013/06/17 19:49:24]

Done.

+
+INIParser::~INIParser() {
+}
+
+void INIParser::Parse(const std::string& content) {
+  // Reads the whole INI file.
+  base::StringTokenizer tokenizer(content, "\r\n");
+
+  // Parses the file.
+  std::string current_section;
+  while (tokenizer.GetNext()) {
+    std::string line = tokenizer.token();
+    if (line.empty()) {
+      // Skips the empty line.
+      continue;
+    }
+    if (line[0] == '#' || line[0] == ';') {
+      // This line is a comment.
+      continue;
+    }
+    if (line[0] == '[') {
+      // It is a section header.
+      current_section = line.substr(1);
+      size_t end = current_section.rfind(']');
+      if (end != std::string::npos)
+        current_section.erase(end);

[Mark Mentovai, 2013/06/17 18:52:37]

This just silently throws away any data after the ']'?

[tommycli, 2013/06/17 19:49:24]

Yes. Noted in comment in header.

+    } else {
+      std::string key, value;
+      size_t equal = line.find('=');
+      if (equal != std::string::npos) {
+        key = line.substr(0, equal);
+        value = line.substr(equal + 1);
+        HandlePair(current_section, key, value);
+      }
+    }
+  }
+}
+
+DictionaryValueINIParser::DictionaryValueINIParser() {
+}
+
+DictionaryValueINIParser::~DictionaryValueINIParser() {
+}
+
+void DictionaryValueINIParser::HandlePair(const std::string& section,
+                                          const std::string& key,
+                                          const std::string& value) {
+
+  // Checks whether the section and key contain a '.' character.
+  // Those sections and keys break DictionaryValue's path format,

[Mark Mentovai, 2013/06/17 18:52:37]

I don’t believe this comment. There’s a whole suite of *WithoutPathExpansion
functions that don’t treat dots specially. See base/values.h.

[tommycli, 2013/06/17 19:49:24]

I'm not certain why it was implemented this way in the Firefox importer. I
believe they wanted a "section.key" path for the DictionaryValue, in which case
calling the *WithoutPathExpansion methods wouldn't work anymore.

I added an explanatory comment in the header file.

+  // so we discard them.
+  if (section.find('.') == std::string::npos &&
+      key.find('.') == std::string::npos)
+    root_.SetString(section + "." + key, value);
+}
+
+}  // namespace base