Move string tokenizer to base/strings.

testing/android/native_test_launcher.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 native tests inside an
 // android application. It outputs (to a fifo) markers identifying the
 // START/PASSED/CRASH of the test suite, FAILURE/SUCCESS of individual tests,
 // etc.
 // These markers are read by the test runner script to generate test results.
 // It installs signal handlers to detect crashes.
 
 #include <android/log.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/locale_utils.h"
 #include "base/android/path_utils.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/at_exit.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_util.h"
 #include "base/stringprintf.h"
-#include "base/string_tokenizer.h"
-#include "base/string_util.h"
+#include "base/strings/string_tokenizer.h"
 #include "gtest/gtest.h"
 #include "testing/jni/ChromeNativeTestActivity_jni.h"
 
 // The main function of the program to be wrapped as a test apk.
 extern int main(int argc, char** argv);
 
 namespace {
 
 // These two command line flags are supported for DumpRenderTree, which needs
 // three fifos rather than a combined one: one for stderr, stdin and stdout.
@@ skipping 33 matching lines @@
   sa.sa_sigaction = SignalHandler;
   sa.sa_flags = SA_SIGINFO;
 
   for (unsigned int i = 0; kExceptionSignals[i] != -1; ++i) {
     sigaction(kExceptionSignals[i], &sa, &g_old_sa[kExceptionSignals[i]]);
   }
 }
 
 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 132 matching lines @@
   InstallHandlers();
 
   base::android::InitVM(vm);
   JNIEnv* env = base::android::AttachCurrentThread();
   if (!RegisterNativesImpl(env)) {
     return -1;
   }
 
   return JNI_VERSION_1_4;
 }