chrome/browser/devtools/device/adb/mock_adb_server.cc - Issue 598663002: Revert of DevTools: Made id unique across different remote browsers

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 598663002: Revert of DevTools: Made id unique across different remote browsers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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/browser/devtools/device/adb/adb_client_socket_browsertest.cc ('k') | chrome/browser/devtools/device/devtools_android_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 0a54c6f5af92f1554098adbf7b4be1d58fe4d1c4..9501843f10e589af3387bd3146777507326ab3aa 100644

--- a/chrome/browser/devtools/device/adb/mock_adb_server.cc

+++ b/chrome/browser/devtools/device/adb/mock_adb_server.cc

@@ -100,26 +100,16 @@

char kSampleChromePages[] = "[ {\n"

" \"description\": \"\",\n"

" \"devtoolsFrontendUrl\": \"/devtools/devtools.html?"

- "ws=/devtools/page/0\",\n"

- " \"id\": \"0\",\n"

+ "ws=/devtools/page/755DE5C9-D49F-811D-0693-51B8E15C80D2\",\n"

+ " \"id\": \"755DE5C9-D49F-811D-0693-51B8E15C80D2\",\n"

" \"title\": \"The Chromium Projects\",\n"

" \"type\": \"page\",\n"

" \"url\": \"http://www.chromium.org/\",\n"

" \"webSocketDebuggerUrl\": \""

- "ws:///devtools/page/0\"\n"

+ "ws:///devtools/page/755DE5C9-D49F-811D-0693-51B8E15C80D2\"\n"

"} ]";

-char kSampleChromeBetaPages[] = "[ {\n"

- " \"description\": \"\",\n"

- " \"devtoolsFrontendUrl\": \"/devtools/devtools.html?"

- "ws=/devtools/page/0\",\n"

- " \"id\": \"0\",\n"

- " \"title\": \"The Chromium Projects\",\n"

- " \"type\": \"page\",\n"

- " \"url\": \"http://www.chromium.org/\",\n"

- " \"webSocketDebuggerUrl\": \""

- "ws:///devtools/page/0\"\n"

- "} ]";

+char kSampleChromeBetaPages[] = "[]";

char kSampleWebViewPages[] = "[ {\n"

" \"description\": \"{\\\"attached\\\":false,\\\"empty\\\":false,"