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

Unified Diff: chrome/browser/devtools/device/adb/mock_adb_server.cc

Issue 2127373006: Use base::StartWith() in more places when appropriate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
Index: chrome/browser/devtools/device/adb/mock_adb_server.cc
diff --git a/chrome/browser/devtools/device/adb/mock_adb_server.cc b/chrome/browser/devtools/device/adb/mock_adb_server.cc
index 8008ffd1383da3c8577205e2c74fa097e53faf0c..a9ff9816538b9d4ec4985be9dd72c342eff15c2b 100644
--- a/chrome/browser/devtools/device/adb/mock_adb_server.cc
+++ b/chrome/browser/devtools/device/adb/mock_adb_server.cc
@@ -427,7 +427,8 @@ class AdbParser : public SimpleHttpServer::Parser,
SendSuccess(base::StringPrintf("%s\tdevice\n%s\toffline",
kSerialOnline,
kSerialOffline));
- } else if (command.find(kHostTransportPrefix) == 0) {
+ } else if (base::StartsWith(command, kHostTransportPrefix,
+ base::CompareCase::SENSITIVE)) {
serial_ = command.substr(strlen(kHostTransportPrefix));
SendSuccess(std::string());
} else if (serial_ != kSerialOnline) {
@@ -540,7 +541,8 @@ void MockAndroidConnection::Receive(const std::string& data) {
SendHTTPResponse(kSampleChromeBetaPages);
else
NOTREACHED() << "Unknown command " << request;
- } else if (socket_name_.find("noprocess_devtools_remote") == 0) {
+ } else if (base::StartsWith(socket_name_, "noprocess_devtools_remote",
+ base::CompareCase::SENSITIVE)) {
if (path == kJsonVersionPath)
SendHTTPResponse("{}");
else if (path == kJsonListPath)
@@ -560,40 +562,42 @@ void MockAndroidConnection::Receive(const std::string& data) {
}
void MockAndroidConnection::ProcessCommand(const std::string& command) {
- if (command.find(kLocalAbstractPrefix) == 0) {
+ if (base::StartsWith(command, kLocalAbstractPrefix,
+ base::CompareCase::SENSITIVE)) {
socket_name_ = command.substr(strlen(kLocalAbstractPrefix));
delegate_->SendSuccess(std::string());
- } else {
- if (command.find(kShellPrefix) == 0) {
- std::string result;
- for (const auto& line :
- base::SplitString(command.substr(strlen(kShellPrefix)), "\n",
- base::KEEP_WHITESPACE,
- base::SPLIT_WANT_NONEMPTY)) {
- if (line == kDeviceModelCommand) {
- result += kDeviceModel;
- result += "\r\n";
- } else if (line == kOpenedUnixSocketsCommand) {
- result += kSampleOpenedUnixSockets;
- } else if (line == kDumpsysCommand) {
- result += kSampleDumpsys;
- } else if (line == kListProcessesCommand) {
- result += kSampleListProcesses;
- } else if (line == kListUsersCommand) {
- result += kSampleListUsers;
- } else if (line.find(kEchoCommandPrefix) == 0) {
- result += line.substr(strlen(kEchoCommandPrefix));
- result += "\r\n";
- } else {
- NOTREACHED() << "Unknown shell command - " << command;
- }
+ return;
+ }
+
+ if (base::StartsWith(command, kShellPrefix, base::CompareCase::SENSITIVE)) {
+ std::string result;
+ for (const auto& line :
+ base::SplitString(command.substr(strlen(kShellPrefix)), "\n",
lazyboy 2016/07/11 20:34:54 Tangential: Do you not prefer using sizeof(kShellP
Lei Zhang 2016/07/11 21:01:47 Done. Ya, I got lazy. The 2007 era answer I found
+ base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) {
+ if (line == kDeviceModelCommand) {
+ result += kDeviceModel;
+ result += "\r\n";
+ } else if (line == kOpenedUnixSocketsCommand) {
+ result += kSampleOpenedUnixSockets;
+ } else if (line == kDumpsysCommand) {
+ result += kSampleDumpsys;
+ } else if (line == kListProcessesCommand) {
+ result += kSampleListProcesses;
+ } else if (line == kListUsersCommand) {
+ result += kSampleListUsers;
+ } else if (base::StartsWith(line, kEchoCommandPrefix,
+ base::CompareCase::SENSITIVE)) {
+ result += line.substr(strlen(kEchoCommandPrefix));
+ result += "\r\n";
+ } else {
+ NOTREACHED() << "Unknown shell command - " << command;
}
- delegate_->SendSuccess(result);
- } else {
- NOTREACHED() << "Unknown command - " << command;
}
- delegate_->Close();
+ delegate_->SendSuccess(result);
+ } else {
+ NOTREACHED() << "Unknown command - " << command;
}
+ delegate_->Close();
}
void MockAndroidConnection::SendHTTPResponse(const std::string& body) {

Powered by Google App Engine
This is Rietveld 408576698