summaryrefslogtreecommitdiffstats
path: root/testing/android
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-02 00:21:39 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-02 00:21:39 +0000
commitf4ebe772e28369908c70e2e79f052d043c6f8eeb (patch)
tree8abbccc21509118c1228bc116a6f0f250759a801 /testing/android
parent11e45efce9cc17e1b2b76e6a636cc63b2c021324 (diff)
downloadchromium_src-f4ebe772e28369908c70e2e79f052d043c6f8eeb.zip
chromium_src-f4ebe772e28369908c70e2e79f052d043c6f8eeb.tar.gz
chromium_src-f4ebe772e28369908c70e2e79f052d043c6f8eeb.tar.bz2
Move string tokenizer to base/strings.
BUG= Review URL: https://codereview.chromium.org/12087091 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/android')
-rw-r--r--testing/android/native_test_launcher.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/testing/android/native_test_launcher.cc b/testing/android/native_test_launcher.cc
index ade30b2..e3cf59e 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;