content/browser/devtools/devtools_browser_target.cc - Issue 296053012: Replace StreamListenSocket with StreamSocket in HttpServer.

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: content/browser/devtools/devtools_browser_target.cc

Issue 296053012: Replace StreamListenSocket with StreamSocket in HttpServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 7 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

« chrome/test/chromedriver/server/chromedriver_server.cc ('K') | « content/browser/devtools/devtools_browser_target.h ('k') | content/browser/devtools/devtools_http_handler_impl.h » ('j') | content/browser/devtools/devtools_http_handler_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/devtools/devtools_browser_target.cc

diff --git a/content/browser/devtools/devtools_browser_target.cc b/content/browser/devtools/devtools_browser_target.cc

index 4a242541853406777516ffab7c8beb6521fd3ae3..00aca51c495403e8528c2c4da4328d443ddc42a3 100644

--- a/content/browser/devtools/devtools_browser_target.cc

+++ b/content/browser/devtools/devtools_browser_target.cc

@@ -16,7 +16,7 @@

namespace content {

DevToolsBrowserTarget::DevToolsBrowserTarget(

- net::HttpServer* http_server,

+ base::WeakPtr<net::HttpServer> http_server,

int connection_id)

: message_loop_proxy_(base::MessageLoopProxy::current()),

http_server_(http_server),

@@ -86,7 +86,7 @@ void DevToolsBrowserTarget::Detach() {

DCHECK_EQ(message_loop_proxy_, base::MessageLoopProxy::current());

DCHECK(http_server_);

- http_server_ = NULL;

+ http_server_ = base::WeakPtr<net::HttpServer>();

std::vector<DevToolsProtocol::Handler*> ui_handlers;

for (std::set<std::string>::iterator domain_it = handle_on_ui_thread_.begin();