Move string tokenizer to base/strings.

chrome/browser/chromeos/system/name_value_pairs_parser.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/chromeos/system/name_value_pairs_parser.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "base/stl_util.h"
-#include "base/string_tokenizer.h"
 #include "base/string_util.h"
+#include "base/strings/string_tokenizer.h"
 
 namespace chromeos {  // NOLINT
 namespace system {
 
 namespace {
 
 const char kQuoteChars[] = "\"";
 const char kTrimChars[] = "\" ";
 
 bool GetToolOutput(int argc, const char* argv[], std::string& output) {
@@ skipping 38 matching lines @@
   return ParseNameValuePairsWithComments(in_string, eq, delim, "");
 }
 
 bool NameValuePairsParser::ParseNameValuePairsWithComments(
     const std::string& in_string,
     const std::string& eq,
     const std::string& delim,
     const std::string& comment_delim) {
   bool all_valid = true;
   // Set up the pair tokenizer.
-  StringTokenizer pair_toks(in_string, delim);
+  base::StringTokenizer pair_toks(in_string, delim);
   pair_toks.set_quote_chars(kQuoteChars);
   // Process token pairs.
   while (pair_toks.GetNext()) {
     std::string pair(pair_toks.token());
     // Anything before the first |eq| is the key, anything after is the value.
     // |eq| must exist.
     size_t eq_pos = pair.find(eq);
     if (eq_pos != std::string::npos) {
       // First |comment_delim| after |eq_pos| starts the comment.
       // A value of |std::string::npos| means that the value spans to the end
@@ skipping 55 matching lines @@
   std::string output_string;
   if (!GetToolOutput(argc, argv, output_string))
     return false;
 
   return ParseNameValuePairsWithComments(
       output_string, eq, delim, comment_delim);
 }
 
 }  // namespace system
 }  // namespace chromeos