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

Side by Side Diff: chrome/browser/devtools/device/adb/mock_adb_server.cc

Issue 560523004: DevTools: Made id unique across different remote browsers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed leak in test 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/memory/weak_ptr.h" 5 #include "base/memory/weak_ptr.h"
6 #include "base/strings/string_number_conversions.h" 6 #include "base/strings/string_number_conversions.h"
7 #include "base/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "base/threading/non_thread_safe.h" 9 #include "base/threading/non_thread_safe.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 " \"Browser\": \"Version/4.0\",\n" 93 " \"Browser\": \"Version/4.0\",\n"
94 " \"Protocol-Version\": \"1.0\",\n" 94 " \"Protocol-Version\": \"1.0\",\n"
95 " \"User-Agent\": \"Mozilla/5.0 (Linux; Android 4.3; Build/KRS74B) " 95 " \"User-Agent\": \"Mozilla/5.0 (Linux; Android 4.3; Build/KRS74B) "
96 "AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Safari/537.36\",\n" 96 "AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Safari/537.36\",\n"
97 " \"WebKit-Version\": \"537.36 (@157588)\"\n" 97 " \"WebKit-Version\": \"537.36 (@157588)\"\n"
98 "}"; 98 "}";
99 99
100 char kSampleChromePages[] = "[ {\n" 100 char kSampleChromePages[] = "[ {\n"
101 " \"description\": \"\",\n" 101 " \"description\": \"\",\n"
102 " \"devtoolsFrontendUrl\": \"/devtools/devtools.html?" 102 " \"devtoolsFrontendUrl\": \"/devtools/devtools.html?"
103 "ws=/devtools/page/755DE5C9-D49F-811D-0693-51B8E15C80D2\",\n" 103 "ws=/devtools/page/0\",\n"
104 " \"id\": \"755DE5C9-D49F-811D-0693-51B8E15C80D2\",\n" 104 " \"id\": \"0\",\n"
105 " \"title\": \"The Chromium Projects\",\n" 105 " \"title\": \"The Chromium Projects\",\n"
106 " \"type\": \"page\",\n" 106 " \"type\": \"page\",\n"
107 " \"url\": \"http://www.chromium.org/\",\n" 107 " \"url\": \"http://www.chromium.org/\",\n"
108 " \"webSocketDebuggerUrl\": \"" 108 " \"webSocketDebuggerUrl\": \""
109 "ws:///devtools/page/755DE5C9-D49F-811D-0693-51B8E15C80D2\"\n" 109 "ws:///devtools/page/0\"\n"
110 "} ]"; 110 "} ]";
111 111
112 char kSampleChromeBetaPages[] = "[]"; 112 char kSampleChromeBetaPages[] = "[ {\n"
113 " \"description\": \"\",\n"
114 " \"devtoolsFrontendUrl\": \"/devtools/devtools.html?"
115 "ws=/devtools/page/0\",\n"
116 " \"id\": \"0\",\n"
117 " \"title\": \"The Chromium Projects\",\n"
118 " \"type\": \"page\",\n"
119 " \"url\": \"http://www.chromium.org/\",\n"
120 " \"webSocketDebuggerUrl\": \""
121 "ws:///devtools/page/0\"\n"
122 "} ]";
113 123
114 char kSampleWebViewPages[] = "[ {\n" 124 char kSampleWebViewPages[] = "[ {\n"
115 " \"description\": \"{\\\"attached\\\":false,\\\"empty\\\":false," 125 " \"description\": \"{\\\"attached\\\":false,\\\"empty\\\":false,"
116 "\\\"height\\\":1173,\\\"screenX\\\":0,\\\"screenY\\\":0," 126 "\\\"height\\\":1173,\\\"screenX\\\":0,\\\"screenY\\\":0,"
117 "\\\"visible\\\":true,\\\"width\\\":800}\",\n" 127 "\\\"visible\\\":true,\\\"width\\\":800}\",\n"
118 " \"devtoolsFrontendUrl\": \"http://chrome-devtools-frontend.appspot.com/" 128 " \"devtoolsFrontendUrl\": \"http://chrome-devtools-frontend.appspot.com/"
119 "serve_rev/@157588/devtools.html?ws=" 129 "serve_rev/@157588/devtools.html?ws="
120 "/devtools/page/3E962D4D-B676-182D-3BE8-FAE7CE224DE7\",\n" 130 "/devtools/page/3E962D4D-B676-182D-3BE8-FAE7CE224DE7\",\n"
121 " \"faviconUrl\": \"http://chromium.org/favicon.ico\",\n" 131 " \"faviconUrl\": \"http://chromium.org/favicon.ico\",\n"
122 " \"id\": \"3E962D4D-B676-182D-3BE8-FAE7CE224DE7\",\n" 132 " \"id\": \"3E962D4D-B676-182D-3BE8-FAE7CE224DE7\",\n"
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 540
531 void StopMockAdbServer() { 541 void StopMockAdbServer() {
532 BrowserThread::PostTaskAndReply( 542 BrowserThread::PostTaskAndReply(
533 BrowserThread::IO, 543 BrowserThread::IO,
534 FROM_HERE, 544 FROM_HERE,
535 base::Bind(&StopMockAdbServerOnIOThread), 545 base::Bind(&StopMockAdbServerOnIOThread),
536 base::MessageLoop::QuitClosure()); 546 base::MessageLoop::QuitClosure());
537 content::RunMessageLoop(); 547 content::RunMessageLoop();
538 } 548 }
539 549
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698