Revert 134443 - Broke win_aura

chrome/browser/ui/hung_plugin_tab_helper.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/ui/hung_plugin_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/process_util.h"
-#include "build/build_config.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/result_codes.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
-#if defined(OS_WIN)
-#include "chrome/browser/hang_monitor/hang_crash_dump_win.h"
-#endif
-
 namespace {
 
 // Delay in seconds before re-showing the hung plugin message. This will be
 // increased each time.
 const int kInitialReshowDelaySec = 10;
 
 // Called on the I/O thread to actually kill the plugin with the given child
 // ID. We specifically don't want this to be a member function since if the
 // user chooses to kill the plugin, we want to kill it even if they close the
 // tab first.
 //
 // Be careful with the child_id. It's supplied by the renderer which might be
 // hacked.
 void KillPluginOnIOThread(int child_id) {
   content::BrowserChildProcessHostIterator iter(
       content::PROCESS_TYPE_PPAPI_PLUGIN);
   while (!iter.Done()) {
     const content::ChildProcessData& data = iter.GetData();
     if (data.id == child_id) {
-#if defined(OS_WIN)
-      CrashDumpAndTerminateHungChildProcess(data.handle);
-#else
+      // TODO(brettw) bug 123021: it might be nice to do some stuff to capture
+      // a stack. The NPAPI Windows hang monitor does some cool stuff in
+      // hung_window_detector.cc.
       base::KillProcess(data.handle, content::RESULT_CODE_HUNG, false);
-#endif
       break;
     }
     ++iter;
   }
   // Ignore the case where we didn't find the plugin, it may have terminated
   // before this function could run.
 }
 
 }  // namespace
 
@@ skipping 202 matching lines @@
   }
 }
 
 InfoBarTabHelper* HungPluginTabHelper::GetInfoBarHelper() {
   TabContentsWrapper* tcw =
       TabContentsWrapper::GetCurrentWrapperForContents(web_contents());
   if (!tcw)
     return NULL;
   return tcw->infobar_tab_helper();
 }