Update the task manager with the debug stub port chosen by nacl.

components/nacl/browser/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 "components/nacl/browser/nacl_process_host.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 628 matching lines @@
     IPC_MESSAGE_HANDLER(NaClProcessMsg_SetKnownToValidate,
                         OnSetKnownToValidate)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(NaClProcessMsg_ResolveFileToken,
                                     OnResolveFileToken)
 #if defined(OS_WIN)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(NaClProcessMsg_AttachDebugExceptionHandler,
                                     OnAttachDebugExceptionHandler)
 #endif
     IPC_MESSAGE_HANDLER(NaClProcessHostMsg_PpapiChannelsCreated,
                         OnPpapiChannelsCreated)
+    IPC_MESSAGE_HANDLER(NaClProcessHostMsg_DebugStubPortSelected,

[Mark Seaborn, 2014/05/08 15:52:23]

FYI, this needs rebasing.  I changed this method yesterday. :-)

Can you make this conditional on OS_WIN?

[bradn, 2014/05/08 17:00:24]

Done.

+                        OnDebugStubPortSelected)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void NaClProcessHost::OnProcessLaunched() {
   if (!StartWithLaunchedProcess())
     delete this;
 }
 
@@ skipping 80 matching lines @@
         reply_msg_, result, error_message);
     nacl_host_message_filter_->Send(reply_msg_);
     nacl_host_message_filter_ = NULL;
     reply_msg_ = NULL;
   }
 }
 
 // TCP port we chose for NaCl debug stub. It can be any other number.
 static const int kInitialDebugStubPort = 4014;
 
+void NaClProcessHost::ChangeDebugStubPort(uint16_t port) {
+  NaClBrowser* nacl_browser = NaClBrowser::GetInstance();
+  if (nacl_browser->HasGdbDebugStubPortListener()) {
+    nacl_browser->FireGdbDebugStubPortOpened(port);
+  }
+  // Set debug stub port on the process object.
+  process_->SetNaClDebugStubPort(port);
+}
+
 #if defined(OS_POSIX)
 net::SocketDescriptor NaClProcessHost::GetDebugStubSocketHandle() {
-  NaClBrowser* nacl_browser = NaClBrowser::GetInstance();
   net::SocketDescriptor s = net::kInvalidSocket;
   // We always try to allocate the default port first. If this fails, we then
   // allocate any available port.
   // On success, if the test system has register a handler
   // (GdbDebugStubPortListener), we fire a notification.
   int port = kInitialDebugStubPort;
   s = net::TCPListenSocket::CreateAndBind("127.0.0.1", port);
   if (s == net::kInvalidSocket) {
     s = net::TCPListenSocket::CreateAndBindAnyPort("127.0.0.1", &port);
   }
   if (s != net::kInvalidSocket) {
-    if (nacl_browser->HasGdbDebugStubPortListener()) {
-      nacl_browser->FireGdbDebugStubPortOpened(port);
-    }
+    ChangeDebugStubPort(port);
   }
-  // Set debug stub port on the process object.
-  process_->SetNaClDebugStubPort(port);
   if (s == net::kInvalidSocket) {
     LOG(ERROR) << "failed to open socket for debug stub";
     return net::kInvalidSocket;
   } else {
     LOG(WARNING) << "debug stub on port " << port;
   }
   if (listen(s, 1)) {
     LOG(ERROR) << "listen() failed on debug stub socket";
     if (IGNORE_EINTR(close(s)) < 0)
       PLOG(ERROR) << "failed to close debug stub socket";
@@ skipping 140 matching lines @@
     ReplyToRenderer(ppapi_renderer_channel_handle,
                     trusted_renderer_channel_handle,
                     manifest_service_channel_handle);
   } else {
     // Attempt to open more than 1 browser channel is not supported.
     // Shut down the NaCl process.
     process_->GetHost()->ForceShutdown();
   }
 }
 
+void NaClProcessHost::OnDebugStubPortSelected(uint16_t debug_stub_port) {
+  ChangeDebugStubPort(debug_stub_port);

[Mark Seaborn, 2014/05/08 15:52:23]

Can you add: CHECK(!uses_nonsfi_mode_) to make this consistent with the other
methods (after rebasing on the change I made yesterday).

[bradn, 2014/05/08 17:00:24]

Done.

+}
+
 bool NaClProcessHost::StartWithLaunchedProcess() {
   NaClBrowser* nacl_browser = NaClBrowser::GetInstance();
 
   if (nacl_browser->IsReady()) {
     return StartNaClExecution();
   } else if (nacl_browser->IsOk()) {
     nacl_browser->WaitForResources(
         base::Bind(&NaClProcessHost::OnResourcesReady,
                    weak_factory_.GetWeakPtr()));
     return true;
@@ skipping 153 matching lines @@
         process_handle.Take(), info,
         base::MessageLoopProxy::current(),
         base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
                    weak_factory_.GetWeakPtr()));
     return true;
   }
 }
 #endif
 
 }  // namespace nacl