diff options
Diffstat (limited to 'chrome/test')
-rw-r--r-- | chrome/test/automated_ui_tests/automated_ui_tests.cc | 2 | ||||
-rw-r--r-- | chrome/test/chrome_process_util_mac.cc | 4 | ||||
-rw-r--r-- | chrome/test/selenium/selenium_test.cc | 2 | ||||
-rw-r--r-- | chrome/test/startup/startup_test.cc | 2 | ||||
-rw-r--r-- | chrome/test/ui/dom_checker_uitest.cc | 2 | ||||
-rw-r--r-- | chrome/test/ui/ui_test.cc | 2 | ||||
-rw-r--r-- | chrome/test/webdriver/dispatch.h | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc index 4436867..047c18a 100644 --- a/chrome/test/automated_ui_tests/automated_ui_tests.cc +++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc @@ -153,7 +153,7 @@ void AutomatedUITest::RunReproduction() { &num_reproductions); } std::vector<std::string> actions; - SplitString(action_string, ',', &actions); + base::SplitString(action_string, ',', &actions); bool did_crash = false; bool command_complete = false; diff --git a/chrome/test/chrome_process_util_mac.cc b/chrome/test/chrome_process_util_mac.cc index c4f12fd..1233250 100644 --- a/chrome/test/chrome_process_util_mac.cc +++ b/chrome/test/chrome_process_util_mac.cc @@ -37,14 +37,14 @@ MacChromeProcessInfoList GetRunningMacProcessInfo( // Process the results std::vector<std::string> ps_output_lines; - SplitString(ps_output, '\n', &ps_output_lines); + base::SplitString(ps_output, '\n', &ps_output_lines); std::vector<std::string>::const_iterator line_iter; for (line_iter = ps_output_lines.begin(); line_iter != ps_output_lines.end(); ++line_iter) { std::string line(CollapseWhitespaceASCII(*line_iter, false)); std::vector<std::string> values; - SplitString(line, ' ', &values); + base::SplitString(line, ' ', &values); if (values.size() == 3) { MacChromeProcessInfo proc_info; int pid; diff --git a/chrome/test/selenium/selenium_test.cc b/chrome/test/selenium/selenium_test.cc index 296d925..071272d 100644 --- a/chrome/test/selenium/selenium_test.cc +++ b/chrome/test/selenium/selenium_test.cc @@ -53,7 +53,7 @@ class SeleniumTest : public UITest { return; std::vector<std::string> tokens; - SplitString(input, ',', &tokens); + base::SplitString(input, ',', &tokens); for (size_t i = 0; i < tokens.size(); ++i) { TrimWhitespaceASCII(tokens[i], TRIM_ALL, &tokens[i]); output->insert(tokens[i]); diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc index 743b820..5fa9380 100644 --- a/chrome/test/startup/startup_test.cc +++ b/chrome/test/startup/startup_test.cc @@ -160,7 +160,7 @@ class StartupTest : public UIPerfTest { { std::string server_version = automation()->server_version(); std::vector<std::string> version_numbers; - SplitString(server_version, '.', &version_numbers); + base::SplitString(server_version, '.', &version_numbers); int chrome_buildnum = 0; ASSERT_TRUE(base::StringToInt(version_numbers[2], &chrome_buildnum)); if (chrome_buildnum < 368) { diff --git a/chrome/test/ui/dom_checker_uitest.cc b/chrome/test/ui/dom_checker_uitest.cc index 1200c97..f299958 100644 --- a/chrome/test/ui/dom_checker_uitest.cc +++ b/chrome/test/ui/dom_checker_uitest.cc @@ -120,7 +120,7 @@ class DomCheckerTest : public UITest { return; std::vector<std::string> tokens; - SplitString(input, '\n', &tokens); + base::SplitString(input, '\n', &tokens); std::vector<std::string>::const_iterator it = tokens.begin(); for (; it != tokens.end(); ++it) { diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index e026e5a..58a1007 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -724,7 +724,7 @@ bool UITestBase::LaunchBrowserHelper(const CommandLine& arguments, if (!extra_chrome_flags.empty()) { // Split by spaces and append to command line std::vector<CommandLine::StringType> flags; - SplitString(extra_chrome_flags, ' ', &flags); + base::SplitString(extra_chrome_flags, ' ', &flags); for (size_t i = 0; i < flags.size(); ++i) command_line.AppendArgNative(flags[i]); } diff --git a/chrome/test/webdriver/dispatch.h b/chrome/test/webdriver/dispatch.h index d85514a..61f877b 100644 --- a/chrome/test/webdriver/dispatch.h +++ b/chrome/test/webdriver/dispatch.h @@ -49,7 +49,7 @@ void Dispatch(struct mg_connection* connection, std::vector<std::string> path_segments; std::string uri(request_info->uri); - SplitString(uri, '/', &path_segments); + base::SplitString(uri, '/', &path_segments); DictionaryValue* parameters = NULL; if ((method == "POST" || method == "PUT") && |