Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3151)

Unified Diff: chrome/test/chromedriver/chrome/adb_impl.cc

Issue 1240183002: Update SplitString calls in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/chromedriver/capabilities.cc ('k') | chrome/test/chromedriver/chrome/browser_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/chrome/adb_impl.cc
diff --git a/chrome/test/chromedriver/chrome/adb_impl.cc b/chrome/test/chromedriver/chrome/adb_impl.cc
index 46db3376c9a01b2cf717bb703658c3b619b0e86a..b177d7dc6b1381ba00b56fe057389e61399b9136 100644
--- a/chrome/test/chromedriver/chrome/adb_impl.cc
+++ b/chrome/test/chromedriver/chrome/adb_impl.cc
@@ -14,6 +14,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_tokenizer.h"
+#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/synchronization/waitable_event.h"
#include "base/time/time.h"
@@ -87,8 +88,9 @@ Status AdbImpl::GetDevices(std::vector<std::string>* devices) {
return status;
base::StringTokenizer lines(response, "\n");
while (lines.GetNext()) {
- std::vector<std::string> fields;
- base::SplitStringAlongWhitespace(lines.token(), &fields);
+ std::vector<std::string> fields = base::SplitString(
+ lines.token_piece(), base::kWhitespaceASCII,
+ base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
if (fields.size() == 2 && fields[1] == "device") {
devices->push_back(fields[0]);
}
@@ -199,17 +201,14 @@ Status AdbImpl::GetPidByName(const std::string& device_serial,
if (!status.IsOk())
return status;
- std::vector<std::string> lines;
- base::SplitString(response, '\n', &lines);
- for (size_t i = 0; i < lines.size(); ++i) {
- std::string line = lines[i];
- if (line.empty())
- continue;
- std::vector<std::string> tokens;
- base::SplitStringAlongWhitespace(line, &tokens);
+ for (const base::StringPiece& line : base::SplitString(
+ response, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) {
+ std::vector<base::StringPiece> tokens = base::SplitStringPiece(
+ line, base::kWhitespaceASCII,
+ base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
if (tokens.size() != 9)
continue;
- if (tokens[8].compare(process_name) == 0) {
+ if (tokens[8] == process_name) {
if (base::StringToInt(tokens[1], pid)) {
return Status(kOk);
} else {
« no previous file with comments | « chrome/test/chromedriver/capabilities.cc ('k') | chrome/test/chromedriver/chrome/browser_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698