Bumping up the default hung plugin timeout to 30 seconds. This matches with

the hung webpage timeout. The other change is to take out the IsHungAppWindow
call as this is redundant when combined with SendMessageTimeout.

Bug=1308327


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1411 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 9 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 2cc725d..d383484 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -68,7 +68,7 @@ static const int kWindowTilePixels = 20;
 static const int kDefaultHungPluginDetectFrequency = 2000;
 
 // How long do we wait before we consider a window hung (in ms).
-static const int kDefaultPluginMessageResponseTimeout = 10000;
+static const int kDefaultPluginMessageResponseTimeout = 30000;
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/chrome/browser/hang_monitor/hung_window_detector.cc b/chrome/browser/hang_monitor/hung_window_detector.cc
index e602438..6f255b3 100644
--- a/chrome/browser/hang_monitor/hung_window_detector.cc
+++ b/chrome/browser/hang_monitor/hung_window_detector.cc
@@ -89,14 +89,13 @@ bool HungWindowDetector::CheckChildWindow(HWND child_window) {
     }
 
     DWORD result = 0;
-    if ((0 == SendMessageTimeout(child_window,
-                                 WM_NULL,
-                                 0,
-                                 0,
-                                 SMTO_BLOCK,
-                                 child_window_message_timeout,
-                                 &result)) ||
-        IsHungAppWindow(child_window)) {
+    if (0 == SendMessageTimeout(child_window,
+                                WM_NULL,
+                                0,
+                                0,
+                                SMTO_BLOCK,
+                                child_window_message_timeout,
+                                &result)) {
       HungWindowNotification::ActionOnHungWindow action =
           HungWindowNotification::HUNG_WINDOW_IGNORE;
 #pragma warning(disable:4312)
@@ -155,6 +154,7 @@ bool HungWindowDetector::CheckChildWindow(HWND child_window) {
         }
       }
     } else {
+      DCHECK(IsHungAppWindow(child_window) == false);
       RemoveProp(child_window, kHungChildWindowTimeout);
     }
   }