| Index: testing/android/native_test_launcher.cc
|
| diff --git a/testing/android/native_test_launcher.cc b/testing/android/native_test_launcher.cc
|
| index ade30b2758d99ea781f1282033631d22f426447f..e3cf59eeca79582c9149f1f07d22e573ff910b90 100644
|
| --- a/testing/android/native_test_launcher.cc
|
| +++ b/testing/android/native_test_launcher.cc
|
| @@ -26,9 +26,9 @@
|
| #include "base/file_path.h"
|
| #include "base/file_util.h"
|
| #include "base/logging.h"
|
| -#include "base/stringprintf.h"
|
| -#include "base/string_tokenizer.h"
|
| #include "base/string_util.h"
|
| +#include "base/stringprintf.h"
|
| +#include "base/strings/string_tokenizer.h"
|
| #include "gtest/gtest.h"
|
| #include "testing/jni/ChromeNativeTestActivity_jni.h"
|
|
|
| @@ -82,7 +82,7 @@ void InstallHandlers() {
|
|
|
| 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;
|
|
|