Index: extensions/shell/browser/shell_browser_main_parts.cc |
diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc |
index f376cbc020a71d777977d145999331b9a180da65..0aff5858e49bb0e64684a62fd213872f3496f964 100644 |
--- a/extensions/shell/browser/shell_browser_main_parts.cc |
+++ b/extensions/shell/browser/shell_browser_main_parts.cc |
@@ -194,9 +194,9 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { |
} |
// CreateHttpHandler retains ownership over DevToolsHttpHandler. |
James Cook
2014/11/13 20:44:01
nit: This comment is wrong. You can just delete it
|
- devtools_http_handler_ = |
+ devtools_http_handler_.reset( |
content::ShellDevToolsManagerDelegate::CreateHttpHandler( |
- browser_context_.get()); |
+ browser_context_.get())); |
if (parameters_.ui_task) { |
// For running browser tests. |
parameters_.ui_task->Run(); |
@@ -219,11 +219,7 @@ bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { |
void ShellBrowserMainParts::PostMainMessageLoopRun() { |
browser_main_delegate_->Shutdown(); |
- if (devtools_http_handler_) { |
- // Note that Stop destroys devtools_http_handler_. |
- devtools_http_handler_->Stop(); |
- devtools_http_handler_ = nullptr; |
- } |
+ devtools_http_handler_.reset(); |
#if !defined(DISABLE_NACL) |
task_tracker_.TryCancelAll(); |