Move string tokenizer to base/strings.

content/shell/android/browsertests_apk/content_browser_tests_android.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.
 
 // This class sets up the environment for running the content browser tests
 // inside an android application.
 
 #include <android/log.h>
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
+#include "base/strings/string_tokenizer.h"
 #include "content/public/app/android_library_loader_hooks.h"
 #include "content/shell/android/shell_jni_registrar.h"
 #include "jni/ContentBrowserTestsActivity_jni.h"
 
 // The main function of the program to be wrapped as an apk.
 extern int main(int argc, char** argv);
 
 namespace {
 
 void ParseArgsFromString(const std::string& command_line,
                          std::vector<std::string>* args) {
-  StringTokenizer tokenizer(command_line, kWhitespaceASCII);
+  base::StringTokenizer tokenizer(command_line, kWhitespaceASCII);
   tokenizer.set_quote_chars("\"");
   while (tokenizer.GetNext()) {
     std::string token;
     RemoveChars(tokenizer.token(), "\"", &token);
     args->push_back(token);
   }
 }
 
 void ParseArgsFromCommandLineFile(std::vector<std::string>* args) {
   // The test runner script writes the command line file in
@@ skipping 74 matching lines @@
     return -1;
 
   if (!content::android::RegisterShellJni(env))
     return -1;
 
   if (!RegisterNativesImpl(env))
     return -1;
 
   return JNI_VERSION_1_4;
 }