Update SplitString calls in chrome.

chrome/common/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/common/importer/firefox_importer_utils.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 120 matching lines @@
 
 bool GetFirefoxVersionAndPathFromProfile(const base::FilePath& profile_path,
                                          int* version,
                                          base::FilePath* app_path) {
   bool ret = false;
   base::FilePath compatibility_file =
       profile_path.AppendASCII("compatibility.ini");
   std::string content;
   base::ReadFileToString(compatibility_file, &content);
   base::ReplaceSubstringsAfterOffset(&content, 0, "\r\n", "\n");
-  std::vector<std::string> lines;
-  base::SplitString(content, '\n', &lines);
 
-  for (size_t i = 0; i < lines.size(); ++i) {
-    const std::string& line = lines[i];
+  for (const std::string& line : base::SplitString(
+           content, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
     if (line.empty() || line[0] == '#' || line[0] == ';')
       continue;
     size_t equal = line.find('=');
     if (equal != std::string::npos) {
       std::string key = line.substr(0, equal);
       if (key == "LastVersion") {
         base::StringToInt(line.substr(equal + 1), version);
         ret = true;
       } else if (key == "LastAppDir") {
         // TODO(evanm): If the path in question isn't convertible to
@@ skipping 79 matching lines @@
     return false;
 
   std::string default_homepages =
       ReadBrowserConfigProp(app_path, "browser.startup.homepage");
 
   size_t seperator = default_homepages.find_first_of('|');
   if (seperator == std::string::npos)
     return homepage.spec() == GURL(default_homepages).spec();
 
   // Crack the string into separate homepage urls.
-  std::vector<std::string> urls;
-  base::SplitString(default_homepages, '|', &urls);
-
-  for (size_t i = 0; i < urls.size(); ++i) {
-    if (homepage.spec() == GURL(urls[i]).spec())
+  for (const std::string& url : base::SplitString(
+           default_homepages, "|",
+           base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
+    if (homepage.spec() == GURL(url).spec())
       return true;
   }
 
   return false;
 }
 
 std::string GetPrefsJsValue(const std::string& content,
                             const std::string& pref_key) {
   // This file has the syntax: user_pref("key", value);
   std::string search_for = std::string("user_pref(\"") + pref_key +
@@ skipping 36 matching lines @@
 //   Copyright=Copyright (c) 1998 - 2010 mozilla.org
 //   ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 //   .........................................
 // In this example the function returns "Iceweasel" (or a localized equivalent).
 base::string16 GetFirefoxImporterName(const base::FilePath& app_path) {
   const base::FilePath app_ini_file = app_path.AppendASCII("application.ini");
   std::string branding_name;
   if (base::PathExists(app_ini_file)) {
     std::string content;
     base::ReadFileToString(app_ini_file, &content);
-    std::vector<std::string> lines;
-    base::SplitString(content, '\n', &lines);
+
     const std::string name_attr("Name=");
     bool in_app_section = false;
-    for (size_t i = 0; i < lines.size(); ++i) {
-      base::TrimWhitespace(lines[i], base::TRIM_ALL, &lines[i]);
-      if (lines[i] == "[App]") {
+    for (const base::StringPiece& line : base::SplitStringPiece(
+             content, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
+      if (line == "[App]") {
         in_app_section = true;
       } else if (in_app_section) {
-        if (lines[i].find(name_attr) == 0) {
-          branding_name = lines[i].substr(name_attr.size());
+        if (line.find(name_attr) == 0) {
+          line.substr(name_attr.size()).CopyToString(&branding_name);
           break;
-        } else if (lines[i].length() > 0 && lines[i][0] == '[') {
+        } else if (line.length() > 0 && line[0] == '[') {
           // No longer in the [App] section.
           break;
         }
       }
     }
   }
 
   base::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);
 }