Move handle dumpage to the renderer process (so that it works correctly) and factor out redundant...

content/browser/renderer_host/browser_render_process_host.cc

 // Copyright (c) 2011 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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "content/browser/renderer_host/browser_render_process_host.h"
 
 #include <algorithm>
@@ skipping 546 matching lines @@
     switches::kEnableAccessibilityLogging,
     switches::kEnableAdaptive,
     switches::kEnableBenchmarking,
     switches::kEnableDCHECK,
     switches::kEnableGPUServiceLogging,
     switches::kEnableGPUClientLogging,
     switches::kEnableLogging,
     switches::kEnableMediaStream,
     switches::kDisableFullScreen,
     switches::kEnablePepperTesting,
+#if defined(OS_WIN)

[jam, 2011/09/19 17:10:48]

nit: this really isn't needed, no?

[Cris Neckar, 2011/09/20 01:22:15]

Done.

+    switches::kAuditAllHandles,
+    switches::kAuditHandles,
+#endif
 #if defined(OS_MACOSX)
     // Allow this to be set when invoking the browser and relayed along.
     switches::kEnableSandboxLogging,
 #endif
     switches::kEnableSeccompSandbox,
     switches::kEnableStatsTable,
     switches::kEnableVideoFullscreen,
     switches::kEnableVideoLogging,
     switches::kFullMemoryCrashReport,
 #if !defined (GOOGLE_CHROME_BUILD)
@@ skipping 72 matching lines @@
   // state that will be lost by not calling its unload handlers properly.
   if (!sudden_termination_allowed())
     return false;
 
   child_process_launcher_.reset();
   ProcessDied();
   fast_shutdown_started_ = true;
   return true;
 }
 
+void BrowserRenderProcessHost::DumpHandles() {
+#if defined(OS_WIN)
+  Send(new ChildProcessMsg_DumpHandles());
+  return;
+#endif
+
+  NOTIMPLEMENTED();
+}
+
 // This is a platform specific function for mapping a transport DIB given its id
 TransportDIB* BrowserRenderProcessHost::MapTransportDIB(
     TransportDIB::Id dib_id) {
 #if defined(OS_WIN)
   // On Windows we need to duplicate the handle from the remote process
   HANDLE section = chrome::GetSectionFromProcess(
       dib_id.handle, GetHandle(), false /* read write */);
   return TransportDIB::Map(section);
 #elif defined(OS_MACOSX)
   // On OSX, the browser allocates all DIBs and keeps a file descriptor around
@@ skipping 79 matching lines @@
   if (deleting_soon_)
     return false;
 
   mark_child_process_activity_time();
   if (msg.routing_id() == MSG_ROUTING_CONTROL) {
     // Dispatch control messages.
     bool msg_is_ok = true;
     IPC_BEGIN_MESSAGE_MAP_EX(BrowserRenderProcessHost, msg, msg_is_ok)
       IPC_MESSAGE_HANDLER(ChildProcessHostMsg_ShutdownRequest,
                           OnShutdownRequest)
+      IPC_MESSAGE_HANDLER(ChildProcessHostMsg_DumpHandlesDone,
+                          OnDumpHandlesDone)
       IPC_MESSAGE_HANDLER(ViewHostMsg_SuddenTerminationChanged,
                           SuddenTerminationChanged)
       IPC_MESSAGE_HANDLER(ViewHostMsg_UserMetricsRecordAction,
                           OnUserMetricsRecordAction)
       IPC_MESSAGE_HANDLER(ViewHostMsg_RevealFolderInOS, OnRevealFolderInOS)
       IPC_MESSAGE_HANDLER(ViewHostMsg_SavedPageAsMHTML, OnSavedPageAsMHTML)
       IPC_MESSAGE_UNHANDLED_ERROR()
     IPC_END_MESSAGE_MAP_EX()
 
     if (!msg_is_ok) {
@@ skipping 95 matching lines @@
 
   // Notify any tabs that might have swapped out renderers from this process.
   // They should not attempt to swap them back in.
   NotificationService::current()->Notify(
       content::NOTIFICATION_RENDERER_PROCESS_CLOSING,
       Source<RenderProcessHost>(this), NotificationService::NoDetails());
 
   Send(new ChildProcessMsg_Shutdown());
 }
 
+void BrowserRenderProcessHost::OnDumpHandlesDone() {
+  // When no other owners of this object, we can delete ourselves.

[jam, 2011/09/19 17:10:48]

you don't want to duplicate this code from RenderProcessHost, since this is
fragile code and if someone changes it in RPH, they won't know about here. so
move the code in RPH to a function that you can call.

as an example, you're currently not calling all_hosts.Remove(id()), which will
lead to crashes when someone iterates through the RPHs.

[Cris Neckar, 2011/09/20 01:22:15]

Done.

+  if (listeners_.IsEmpty()) {
+    NotificationService::current()->Notify(
+        content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
+        Source<RenderProcessHost>(this), NotificationService::NoDetails());
+    MessageLoop::current()->DeleteSoon(FROM_HERE, this);
+    deleting_soon_ = true;
+  }
+}
+
 void BrowserRenderProcessHost::SuddenTerminationChanged(bool enabled) {
   set_sudden_termination_allowed(enabled);
 }
 
 void BrowserRenderProcessHost::SetBackgrounded(bool backgrounded) {
   // Note: we always set the backgrounded_ value.  If the process is NULL
   // (and hence hasn't been created yet), we will set the process priority
   // later when we create the process.
   backgrounded_ = backgrounded;
   if (!child_process_launcher_.get() || child_process_launcher_->IsStarting())
@@ skipping 57 matching lines @@
 void BrowserRenderProcessHost::OnRevealFolderInOS(const FilePath& path) {
   // Only honor the request if appropriate persmissions are granted.
   if (ChildProcessSecurityPolicy::GetInstance()->CanReadFile(id(), path))
     content::GetContentClient()->browser()->OpenItem(path);
 }
 
 void BrowserRenderProcessHost::OnSavedPageAsMHTML(int job_id, bool success) {
   content::GetContentClient()->browser()->GetMHTMLGenerationManager()->
       MHTMLGenerated(job_id, success);
 }