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

content/browser/child_process_launcher.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.
 
 #include "content/browser/child_process_launcher.h"
 
 #include <utility>  // For std::pair.
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/content_browser_client.h"
 #include "content/common/chrome_descriptors.h"
 #include "content/common/content_switches.h"
 #include "content/common/process_watcher.h"
 #include "content/common/result_codes.h"
 
 #if defined(OS_WIN)
 #include "base/file_path.h"
-#include "content/browser/handle_enumerator_win.h"
 #include "content/common/sandbox_policy.h"
 #elif defined(OS_MACOSX)
 #include "content/browser/mach_broker_mac.h"
 #elif defined(OS_POSIX)
 #include "base/memory/singleton.h"
 #include "content/browser/zygote_host_linux.h"
 #include "content/browser/renderer_host/render_sandbox_host_linux.h"
 #endif
 
 #if defined(OS_POSIX)
@@ skipping 195 matching lines @@
     }
   }
 
   void Terminate() {
     if (!process_.handle())
       return;
 
     if (!terminate_child_on_shutdown_)
       return;
 
-#if defined(OS_WIN)
-    const CommandLine& browser_command_line =
-        *CommandLine::ForCurrentProcess();
-    if (browser_command_line.HasSwitch(switches::kAuditHandles) ||
-        browser_command_line.HasSwitch(switches::kAuditAllHandles)) {
-      scoped_refptr<content::HandleEnumerator> handle_enum(
-          new content::HandleEnumerator(process_.handle(),
-              browser_command_line.HasSwitch(switches::kAuditAllHandles)));
-      handle_enum->RunHandleEnumeration();
-      process_.set_handle(base::kNullProcessHandle);
-      return;
-    }
-#endif
-
     // On Posix, EnsureProcessTerminated can lead to 2 seconds of sleep!  So
     // don't this on the UI/IO threads.
     BrowserThread::PostTask(
         BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
         NewRunnableFunction(
             &Context::TerminateInternal,
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
             zygote_,
 #endif
             process_.handle()));
@@ skipping 124 matching lines @@
       NewRunnableFunction(
           &ChildProcessLauncher::Context::SetProcessBackgrounded,
           GetHandle(), background));
 }
 
 void ChildProcessLauncher::SetTerminateChildOnShutdown(
   bool terminate_on_shutdown) {
   if (context_)
     context_->set_terminate_child_on_shutdown(terminate_on_shutdown);
 }