Index: android_webview/native/aw_dev_tools_server.cc |
diff --git a/android_webview/native/aw_dev_tools_server.cc b/android_webview/native/aw_dev_tools_server.cc |
index 4d5808b60774bd254a8f90038956c8e8156da255..3509b9f310b6ac0f89ace77782b63bf88d81c36b 100644 |
--- a/android_webview/native/aw_dev_tools_server.cc |
+++ b/android_webview/native/aw_dev_tools_server.cc |
@@ -92,8 +92,7 @@ class UnixDomainServerSocketFactory |
namespace android_webview { |
-AwDevToolsServer::AwDevToolsServer() |
- : protocol_handler_(NULL) { |
+AwDevToolsServer::AwDevToolsServer() { |
} |
AwDevToolsServer::~AwDevToolsServer() { |
@@ -107,20 +106,15 @@ void AwDevToolsServer::Start() { |
scoped_ptr<content::DevToolsHttpHandler::ServerSocketFactory> factory( |
new UnixDomainServerSocketFactory( |
base::StringPrintf(kSocketNameFormat, getpid()))); |
- protocol_handler_ = content::DevToolsHttpHandler::Start( |
+ protocol_handler_.reset(content::DevToolsHttpHandler::Start( |
factory.Pass(), |
base::StringPrintf(kFrontEndURL, content::GetWebKitRevision().c_str()), |
new AwDevToolsServerDelegate(), |
- base::FilePath()); |
+ base::FilePath())); |
} |
void AwDevToolsServer::Stop() { |
- if (!protocol_handler_) |
- return; |
- // Note that the call to Stop() below takes care of |protocol_handler_| |
- // deletion. |
- protocol_handler_->Stop(); |
- protocol_handler_ = NULL; |
+ protocol_handler_.reset(); |
} |
bool AwDevToolsServer::IsStarted() const { |