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

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

Issue 635623003: Cleanup: Better constify some strings in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mac Created 6 years, 2 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/test/chromedriver/chrome/device_manager.cc
diff --git a/chrome/test/chromedriver/chrome/device_manager.cc b/chrome/test/chromedriver/chrome/device_manager.cc
index 8bedee4eb32681397216535dd754333d74ee329f..8e77f0cc82e71c2e434aa3ff21b171a598a92aa0 100644
--- a/chrome/test/chromedriver/chrome/device_manager.cc
+++ b/chrome/test/chromedriver/chrome/device_manager.cc
@@ -17,8 +17,8 @@
#include "chrome/test/chromedriver/chrome/status.h"
// TODO(craigdh): Remove once Chromedriver no longer supports pre-m33 Chrome.
-const char* kChromeCmdLineFileBeforeM33 = "/data/local/chrome-command-line";
-const char* kChromeCmdLineFile = "/data/local/tmp/chrome-command-line";
+const char kChromeCmdLineFileBeforeM33[] = "/data/local/chrome-command-line";
+const char kChromeCmdLineFile[] = "/data/local/tmp/chrome-command-line";
Device::Device(
const std::string& device_serial, Adb* adb,
@@ -114,16 +114,16 @@ Status Device::SetUp(const std::string& package,
active_package_ = package;
}
- this->ForwardDevtoolsPort(package, process, device_socket, port);
+ this->ForwardDevtoolsPort(package, process, port, &device_socket);
return status;
}
Status Device::ForwardDevtoolsPort(const std::string& package,
const std::string& process,
- std::string& device_socket,
- int port) {
- if (device_socket.empty()) {
+ int port,
+ std::string* device_socket) {
+ if (device_socket->empty()) {
// Assume this is a WebView app.
int pid;
Status status = adb_->GetPidByName(serial_,
@@ -135,10 +135,10 @@ Status Device::ForwardDevtoolsPort(const std::string& package,
"process name must be specified if not equal to package name");
return status;
}
- device_socket = base::StringPrintf("webview_devtools_remote_%d", pid);
+ *device_socket = base::StringPrintf("webview_devtools_remote_%d", pid);
}
- return adb_->ForwardPort(serial_, port, device_socket);
+ return adb_->ForwardPort(serial_, port, *device_socket);
}
Status Device::TearDown() {
« no previous file with comments | « chrome/test/chromedriver/chrome/device_manager.h ('k') | chrome/test/chromedriver/chrome/devtools_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698