[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 314 matching lines @@
 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))
+  base::AutoLock locked(server_ip_address_lock_);
+  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 439 matching lines @@
       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));
+  {
+    base::AutoLock locked(server_ip_address_lock_);

[vkuzkokov, 2014/10/22 13:20:03]

Use of locks is very limited in chromium, especially on the UI thread.
The go-to way for doing this is to post IPEndPoint using BrowserThread::PostTask
and read and modify server_ip_address_ only on UI.

[byungwoo, 2014/10/23 02:10:20]

Thank you for the review and suggestion.
I'll apply it.

+    server_ip_address_.reset(new net::IPEndPoint());
+    server_->GetLocalAddress(server_ip_address_.get());
+  }
   if (!active_port_output_directory_.empty())
     WriteActivePortToUserProfile();
 }
 
 // Runs on the handler thread
 void DevToolsHttpHandlerImpl::Teardown() {
+  {
+    base::AutoLock locked(server_ip_address_lock_);
+    server_ip_address_.reset(NULL);
+  }
   server_.reset(NULL);
 }
 
 // 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,
@@ skipping 145 matching lines @@
         id.c_str(),
         host);
     dictionary->SetString(
         kTargetDevtoolsFrontendUrlField, devtools_frontend_url);
   }
 
   return dictionary;
 }
 
 }  // namespace content