| Index: chrome/browser/devtools/devtools_adb_bridge.cc
|
| diff --git a/chrome/browser/devtools/devtools_adb_bridge.cc b/chrome/browser/devtools/devtools_adb_bridge.cc
|
| index fb006f19bb5281e644fed10c1909b1d447f8deff..c903b5a7b8412fa75e8b067a7a9a610c0592b7c0 100644
|
| --- a/chrome/browser/devtools/devtools_adb_bridge.cc
|
| +++ b/chrome/browser/devtools/devtools_adb_bridge.cc
|
| @@ -38,7 +38,6 @@ using net::WebSocket;
|
| namespace {
|
|
|
| static const char kDevToolsAdbBridgeThreadName[] = "Chrome_DevToolsADBThread";
|
| -static const char kDevToolsChannelPattern[] = "devtools_remote";
|
| static const char kHostDevicesCommand[] = "host:devices";
|
| static const char kDeviceModelCommand[] =
|
| "host:transport:%s|shell:getprop ro.product.model";
|
| @@ -274,7 +273,8 @@ class AdbPagesCommand : public base::RefCounted<AdbPagesCommand> {
|
| socket_to_package_.clear();
|
| std::vector<std::string> entries;
|
| Tokenize(response, "\n", &entries);
|
| - const std::string channel_pattern = kDevToolsChannelPattern;
|
| + const std::string channel_pattern =
|
| + base::StringPrintf(kDevToolsChannelNameFormat, "");
|
| for (size_t i = 1; i < entries.size(); ++i) {
|
| std::vector<std::string> fields;
|
| Tokenize(entries[i], " ", &fields);
|
| @@ -309,6 +309,8 @@ class AdbPagesCommand : public base::RefCounted<AdbPagesCommand> {
|
|
|
| } // namespace
|
|
|
| +const char kDevToolsChannelNameFormat[] = "%s_devtools_remote";
|
| +
|
| class AgentHostDelegate;
|
|
|
| typedef std::map<std::string, AgentHostDelegate*> AgentHostDelegates;
|
|
|