Revert 270907 "Remove knowledge of nacl from content."

trunk/src/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 294 matching lines @@
     int exit_code = 0;
     process_->GetTerminationStatus(false /* known_dead */, &exit_code);
     std::string message =
         base::StringPrintf("NaCl process exited with status %i (0x%x)",
                            exit_code, exit_code);
     if (exit_code == 0) {
       VLOG(1) << message;
     } else {
       LOG(ERROR) << message;
     }
-    NaClBrowser::GetInstance()->OnProcessEnd(process_->GetData().id);
   }
 
   if (internal_->socket_for_renderer != NACL_INVALID_HANDLE) {
     if (NaClClose(internal_->socket_for_renderer) != 0) {
       NOTREACHED() << "NaClClose() failed";
     }
   }
 
   if (internal_->socket_for_sel_ldr != NACL_INVALID_HANDLE) {
     if (NaClClose(internal_->socket_for_sel_ldr) != 0) {
@@ skipping 19 matching lines @@
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisablePnaclCrashThrottling)) {
     NaClBrowser::GetInstance()->OnProcessCrashed();
   }
 }
 
 // This is called at browser startup.
 // static
 void NaClProcessHost::EarlyStartup() {
   NaClBrowser::GetInstance()->EarlyStartup();
-  // Inform NaClBrowser that we exist and will have a debug port at some point.
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // Open the IRT file early to make sure that it isn't replaced out from
   // under us by autoupdate.
   NaClBrowser::GetInstance()->EnsureIrtAvailable();
 #endif
   CommandLine* cmd = CommandLine::ForCurrentProcess();
   UMA_HISTOGRAM_BOOLEAN(
       "NaCl.nacl-gdb",
       !cmd->GetSwitchValuePath(switches::kNaClGdb).empty());
   UMA_HISTOGRAM_BOOLEAN(
@@ skipping 120 matching lines @@
   if (!CommandLine::ForCurrentProcess()->GetSwitchValuePath(
           switches::kNaClGdb).empty()) {
     LaunchNaClGdb();
   }
 }
 
 #if defined(OS_WIN)
 void NaClProcessHost::OnProcessLaunchedByBroker(base::ProcessHandle handle) {
   process_launched_by_broker_ = true;
   process_->SetHandle(handle);
-  SetDebugStubPort(nacl::kGdbDebugStubPortUnknown);
   if (!StartWithLaunchedProcess())
     delete this;
 }
 
 void NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker(bool success) {
   IPC::Message* reply = attach_debug_exception_handler_reply_msg_.release();
   NaClProcessMsg_AttachDebugExceptionHandler::WriteReplyParams(reply, success);
   Send(reply);
 }
 #endif
@@ skipping 255 matching lines @@
   DCHECK(reply_msg_);
   if (nacl_host_message_filter_ != NULL && reply_msg_ != NULL) {
     NaClHostMsg_LaunchNaCl::WriteReplyParams(
         reply_msg_, result, error_message);
     nacl_host_message_filter_->Send(reply_msg_);
     nacl_host_message_filter_ = NULL;
     reply_msg_ = NULL;
   }
 }
 
-void NaClProcessHost::SetDebugStubPort(int port) {
+void NaClProcessHost::SetDebugStubPort(uint16_t port) {
   NaClBrowser* nacl_browser = NaClBrowser::GetInstance();
-  nacl_browser->SetProcessGdbDebugStubPort(process_->GetData().id, port);
+  if (nacl_browser->HasGdbDebugStubPortListener()) {
+    nacl_browser->FireGdbDebugStubPortOpened(port);
+  }
+  // Set debug stub port on the process object.
+  process_->SetNaClDebugStubPort(port);
 }
 
 #if defined(OS_POSIX)
 // TCP port we chose for NaCl debug stub. It can be any other number.
 static const int kInitialDebugStubPort = 4014;
 
 net::SocketDescriptor NaClProcessHost::GetDebugStubSocketHandle() {
   net::SocketDescriptor s = net::kInvalidSocket;
   // We always try to allocate the default port first. If this fails, we then
   // allocate any available port.
@@ skipping 346 matching lines @@
         process_handle.Take(), info,
         base::MessageLoopProxy::current(),
         base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
                    weak_factory_.GetWeakPtr()));
     return true;
   }
 }
 #endif
 
 }  // namespace nacl