Replace StreamListenSocket with StreamSocket in HttpServer.

content/browser/devtools/devtools_browser_target.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/devtools/devtools_browser_target.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/server/http_server.h"
 
 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),
       connection_id_(connection_id),
       weak_factory_(this) {
 }
 
 void DevToolsBrowserTarget::RegisterDomainHandler(
     const std::string& domain,
     DevToolsProtocol::Handler* handler,
@@ skipping 49 matching lines @@
       base::Bind(&DevToolsBrowserTarget::HandleCommandOnUIThread,
                  this,
                  handler,
                  command));
 }
 
 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();
        domain_it != handle_on_ui_thread_.end();
        ++domain_it) {
     DomainHandlerMap::iterator handler_it = handlers_.find(*domain_it);
     CHECK(handler_it != handlers_.end());
     ui_handlers.push_back(handler_it->second);
     handlers_.erase(handler_it);
   }
@@ skipping 29 matching lines @@
 }
 
 void DevToolsBrowserTarget::DeleteHandlersOnUIThread(
     std::vector<DevToolsProtocol::Handler*> handlers) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   STLDeleteElements(&handlers);
 }
 
 void DevToolsBrowserTarget::Respond(const std::string& message) {
   DCHECK_EQ(message_loop_proxy_, base::MessageLoopProxy::current());
   if (!http_server_)

[pfeldman, 2014/05/22 06:01:05]

if (!http_server_->get())

[byungchul, 2014/05/28 01:19:35]

weak_ptr is testable.

     return;
   http_server_->SendOverWebSocket(connection_id_, message);
 }
 
 void DevToolsBrowserTarget::RespondFromUIThread(const std::string& message) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   message_loop_proxy_->PostTask(
       FROM_HERE,
       base::Bind(&DevToolsBrowserTarget::Respond, this, message));
 }
 
 }  // namespace content