[DevTools] Keep IP address of HttpServer as a member of DevToolsHttpHandlerImpl.

content/browser/devtools/devtools_http_handler_impl.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_http_handler_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 300 matching lines @@
     return;
   }
 
   thread_->message_loop()->PostTask(
       FROM_HERE,
       base::Bind(&DevToolsHttpHandlerImpl::Init, this));
 }
 
 void DevToolsHttpHandlerImpl::ResetHandlerThread() {
   thread_.reset();
+  server_ip_address_.reset();
 }
 
 void DevToolsHttpHandlerImpl::ResetHandlerThreadAndRelease() {
   ResetHandlerThread();
   Release();
 }
 
 void DevToolsHttpHandlerImpl::Stop() {
   if (!thread_)
     return;
   BrowserThread::PostTaskAndReply(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&DevToolsHttpHandlerImpl::StopHandlerThread, this),
       base::Bind(&DevToolsHttpHandlerImpl::ResetHandlerThreadAndRelease, this));
 }
 
 void DevToolsHttpHandlerImpl::StopWithoutRelease() {
   if (!thread_)
     return;
   BrowserThread::PostTaskAndReply(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&DevToolsHttpHandlerImpl::StopHandlerThread, this),
       base::Bind(&DevToolsHttpHandlerImpl::ResetHandlerThread, this));
 }
 
 GURL DevToolsHttpHandlerImpl::GetFrontendURL() {
-  net::IPEndPoint ip_address;
-  if (server_ && server_->GetLocalAddress(&ip_address))
+  if (!server_ip_address_)
     return GURL();
-  return GURL(std::string("http://") + ip_address.ToString() + frontend_url_);
+  return GURL(std::string("http://") + server_ip_address_->ToString() + frontend_url_);
 }
 
 static std::string PathWithoutParams(const std::string& path) {
   size_t query_position = path.find("?");
   if (query_position != std::string::npos)
     return path.substr(0, query_position);
   return path;
 }
 
 static std::string GetMimeType(const std::string& filename) {
@@ skipping 408 matching lines @@
   ConnectionToClientMap::iterator it =
       connection_to_client_ui_.find(connection_id);
   if (it != connection_to_client_ui_.end()) {
     DevToolsAgentHostClientImpl* client =
         static_cast<DevToolsAgentHostClientImpl*>(it->second);
     delete client;
     connection_to_client_ui_.erase(connection_id);
   }
 }
 
+void DevToolsHttpHandlerImpl::OnHttpServerInitialized(
+    const net::IPEndPoint& ip_address) {
+  server_ip_address_.reset(new net::IPEndPoint(ip_address));
+}
+
 DevToolsHttpHandlerImpl::DevToolsHttpHandlerImpl(
     scoped_ptr<ServerSocketFactory> server_socket_factory,
     const std::string& frontend_url,
     DevToolsHttpHandlerDelegate* delegate,
     const base::FilePath& active_port_output_directory)
     : frontend_url_(frontend_url),
       server_socket_factory_(server_socket_factory.Pass()),
       delegate_(delegate),
       active_port_output_directory_(active_port_output_directory) {
   if (frontend_url_.empty())
     frontend_url_ = "/devtools/devtools.html";
 
   // Balanced in ResetHandlerThreadAndRelease().
   AddRef();
 }
 
 // Runs on the handler thread
 void DevToolsHttpHandlerImpl::Init() {
   scoped_ptr<net::ServerSocket> server_socket =
       server_socket_factory_->CreateAndListen();
   if (!server_socket) {
     LOG(ERROR) << "Cannot start http server for devtools. Stop devtools.";
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&DevToolsHttpHandlerImpl::StopWithoutRelease, this));
     return;
   }
 
   server_.reset(new net::HttpServer(server_socket.Pass(), this));
+  net::IPEndPoint ip_address;
+  server_->GetLocalAddress(&ip_address);
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&DevToolsHttpHandlerImpl::OnHttpServerInitialized,
+                 this, ip_address));
   if (!active_port_output_directory_.empty())
     WriteActivePortToUserProfile();
 }
 
 // Runs on the handler thread
 void DevToolsHttpHandlerImpl::Teardown() {
-  server_.reset(NULL);
+  server_.reset();
 }
 
 // Runs on FILE thread to make sure that it is serialized against
 // {Start|Stop}HandlerThread and to allow calling pthread_join.
 void DevToolsHttpHandlerImpl::StopHandlerThread() {
   if (!thread_->message_loop())
     return;
   thread_->message_loop()->PostTask(
       FROM_HERE,
       base::Bind(&DevToolsHttpHandlerImpl::Teardown, this));
@@ skipping 144 matching lines @@
         id.c_str(),
         host);
     dictionary->SetString(
         kTargetDevtoolsFrontendUrlField, devtools_frontend_url);
   }
 
   return dictionary;
 }
 
 }  // namespace content