Test that debug stub works with browser.

chrome/browser/nacl_host/nacl_process_host.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 "chrome/browser/nacl_host/nacl_process_host.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 644 matching lines @@
   reply_msg_ = NULL;
   internal_->sockets_for_renderer.clear();
   return true;
 }
 
 // TCP port we chose for NaCl debug stub. It can be any other number.
 static const int kDebugStubPort = 4014;
 
 #if defined(OS_POSIX)
 SocketDescriptor NaClProcessHost::GetDebugStubSocketHandle() {
-  SocketDescriptor s = net::TCPListenSocket::CreateAndBind("127.0.0.1",
-                                                           kDebugStubPort);
+  NaClBrowser* nacl_browser = NaClBrowser::GetInstance();
+  SocketDescriptor s;
+  if (nacl_browser->HasDebugStubPortListener()) {

[Mark Seaborn, 2012/12/04 21:46:42]

Please add a comment to explain that this code path is used during testing only.

[halyavin, 2012/12/05 10:05:57]

Done.

+    int port;
+    s = net::TCPListenSocket::CreateAndBindAnyPort("127.0.0.1", &port);
+    if (s != net::TCPListenSocket::kInvalidSocket) {
+      nacl_browser->DebugStubNewPortAllocated(port);
+    }
+  } else {
+    s = net::TCPListenSocket::CreateAndBind("127.0.0.1", kDebugStubPort);
+  }
+  if (s == net::TCPListenSocket::kInvalidSocket) {
+    LOG(ERROR) << "failed to open socket for debug stub";
+    return net::TCPListenSocket::kInvalidSocket;
+  }
   if (listen(s, 1)) {
     LOG(ERROR) << "listen() failed on debug stub socket";
+    close(s);

[Mark Seaborn, 2012/12/04 21:46:42]

Please CHECK that close() doesn't return an error

[halyavin, 2012/12/05 10:05:57]

I don't think we should kill release browser for this, so I added PLOG here.
Search shows that this is more common approach than DPCHECK.

[Mark Seaborn, 2012/12/05 18:00:47]

I disagree.  EBADF from close() indicates a programming error as serious as a
double free(), which should abort the process ASAP because it could be a
security hole.

But I am not going to push this here, because this is just one instance of
close(), so you can leave it as it is.

     return net::TCPListenSocket::kInvalidSocket;
   }
   return s;
 }
 #endif
 
 bool NaClProcessHost::StartNaClExecution() {
   NaClBrowser* nacl_browser = NaClBrowser::GetInstance();
 
   nacl::NaClStartParams params;
@@ skipping 220 matching lines @@
   } else {
     NaClStartDebugExceptionHandlerThread(
         process_handle.Take(), info,
         base::MessageLoopProxy::current(),
         base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
                    weak_factory_.GetWeakPtr()));
     return true;
   }
 }
 #endif