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

Unified Diff: chrome/test/chromedriver/net/adb_client_socket.cc

Issue 2458573004: Move debug_devtools to a buildflag_header. (Closed)
Patch Set: Merge Created 4 years, 1 month 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/BUILD.gn ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/net/adb_client_socket.cc
diff --git a/chrome/test/chromedriver/net/adb_client_socket.cc b/chrome/test/chromedriver/net/adb_client_socket.cc
index 46c5b705391f144c55697f57cf63d8f6f717e719..f8f454c27e274769c96b2616f1a138a9cddcb5bf 100644
--- a/chrome/test/chromedriver/net/adb_client_socket.cc
+++ b/chrome/test/chromedriver/net/adb_client_socket.cc
@@ -18,6 +18,7 @@
#include "net/base/net_errors.h"
#include "net/log/net_log_source.h"
#include "net/socket/tcp_client_socket.h"
+#include "third_party/WebKit/public/public_features.h"
namespace {
@@ -309,20 +310,20 @@ void AdbClientSocket::AdbQuery(int port,
new AdbQuerySocket(port, query, callback);
}
-#if defined(DEBUG_DEVTOOLS)
+#if BUILDFLAG(DEBUG_DEVTOOLS)
static void UseTransportQueryForDesktop(const SocketCallback& callback,
net::StreamSocket* socket,
int result) {
callback.Run(result, socket);
}
-#endif // defined(DEBUG_DEVTOOLS)
+#endif // BUILDFLAG(DEBUG_DEVTOOLS)
// static
void AdbClientSocket::TransportQuery(int port,
const std::string& serial,
const std::string& socket_name,
const SocketCallback& callback) {
-#if defined(DEBUG_DEVTOOLS)
+#if BUILDFLAG(DEBUG_DEVTOOLS)
if (serial.empty()) {
// Use plain socket for remote debugging on Desktop (debugging purposes).
int tcp_port = 0;
@@ -336,7 +337,7 @@ void AdbClientSocket::TransportQuery(int port,
socket->Connect(base::Bind(&UseTransportQueryForDesktop, callback, socket));
return;
}
-#endif // defined(DEBUG_DEVTOOLS)
+#endif // BUILDFLAG(DEBUG_DEVTOOLS)
new AdbTransportSocket(port, serial, socket_name, callback);
}
« no previous file with comments | « chrome/test/chromedriver/BUILD.gn ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698