Revert 109984 - Tests for WebUI Hung Renderer Dialog

chrome/browser/ui/webui/hung_renderer_dialog.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 "chrome/browser/ui/webui/hung_renderer_dialog.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 17 matching lines @@
 namespace {
 HungRendererDialog* g_instance = NULL;
 const int kHungRendererDialogWidth = 425;
 const int kHungRendererDialogHeight = 200;
 }
 
 namespace browser {
 
 void ShowHungRendererDialog(TabContents* contents) {
 #if defined(OS_CHROMEOS) || defined(USE_AURA)
-  HungRendererDialog::ShowHungRendererDialog(contents, true);
+  HungRendererDialog::ShowHungRendererDialog(contents);
 #else
   // TODO(rbyers): Remove IsMoreWebUI check once we decide for sure which
   // platforms will use the WebUI version of this dialog.
   if (ChromeWebUI::IsMoreWebUI())
     HungRendererDialog::ShowHungRendererDialog(contents);
   else
     ShowNativeHungRendererDialog(contents);
 #endif
 }
 
 void HideHungRendererDialog(TabContents* contents) {
 #if defined(OS_CHROMEOS) || defined(USE_AURA)
   HungRendererDialog::HideHungRendererDialog(contents);
 #else
   if (ChromeWebUI::IsMoreWebUI())
     HungRendererDialog::HideHungRendererDialog(contents);
   else
     HideNativeHungRendererDialog(contents);
 #endif
 }
 
 }  // namespace browser
 
 ////////////////////////////////////////////////////////////////////////////////
 // HungRendererDialog public static methods
 
 void HungRendererDialog::ShowHungRendererDialog(TabContents* contents) {
-  ShowHungRendererDialogInternal(contents, true);
+  if (!logging::DialogsAreSuppressed()) {
+    if (g_instance)
+      return;
+    g_instance = new HungRendererDialog();
+    g_instance->ShowDialog(contents);
+  }
 }
 
 void HungRendererDialog::HideHungRendererDialog(TabContents* contents) {
   if (!logging::DialogsAreSuppressed() && g_instance)
     g_instance->HideDialog(contents);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// HungRendererDialog::TabContentsObserverImpl
-
-HungRendererDialog::TabContentsObserverImpl::TabContentsObserverImpl(
-    HungRendererDialog* dialog,
-    TabContents* contents)
-    : TabContentsObserver(contents),
-      contents_(contents),
-      dialog_(dialog) {
-}
-
-void HungRendererDialog::TabContentsObserverImpl::RenderViewGone() {
-  dialog_->HideDialog(contents_);
-}
-
-void HungRendererDialog::TabContentsObserverImpl::TabContentsDestroyed(
-    TabContents* tab) {
-  dialog_->HideDialog(contents_);
-}
 
 ////////////////////////////////////////////////////////////////////////////////
 // HungRendererDialog private methods
 
-HungRendererDialog::HungRendererDialog(bool is_enabled)
+HungRendererDialog::HungRendererDialog()
     : contents_(NULL),
       handler_(NULL),
-      is_enabled_(is_enabled),
       window_(NULL) {
 }
 
-HungRendererDialog::~HungRendererDialog() {
-}
-
-void HungRendererDialog::ShowHungRendererDialogInternal(TabContents* contents,
-                                                        bool is_enabled) {
-  if (!logging::DialogsAreSuppressed()) {
-    if (g_instance)
-      return;
-    g_instance = new HungRendererDialog(is_enabled);
-    g_instance->ShowDialog(contents);
-  }
-}
-
 void HungRendererDialog::ShowDialog(TabContents* contents) {
   DCHECK(contents);
   contents_ = contents;
   Browser* browser = BrowserList::GetLastActive();
   DCHECK(browser);
   handler_ = new HungRendererDialogHandler(contents_);
   window_ = browser->BrowserShowHtmlDialog(this, NULL);
-  contents_observer_.reset(new TabContentsObserverImpl(this, contents_));
 }
 
 void HungRendererDialog::HideDialog(TabContents* contents) {
   DCHECK(contents);
   // Don't close the dialog if it's a TabContents for some other renderer.
   if (contents_ && contents_->GetRenderProcessHost() !=
       contents->GetRenderProcessHost())
     return;
   // Settings |contents_| to NULL prevents the hang monitor from restarting.
   // We do this because the close dialog handler runs whether it is trigged by
   // the user closing the box, or by being closed externally with widget->Close.
-  contents_observer_.reset();
   contents_ = NULL;
   DCHECK(handler_);
   handler_->CloseDialog();
 }
 
 bool HungRendererDialog::IsDialogModal() const {
   return false;
 }
 
 string16 HungRendererDialog::GetDialogTitle() const {
@@ skipping 11 matching lines @@
 
 void HungRendererDialog::GetDialogSize(gfx::Size* size) const {
   size->SetSize(kHungRendererDialogWidth, kHungRendererDialogHeight);
 }
 
 std::string HungRendererDialog::GetDialogArgs() const {
   return std::string();  // There are no args used.
 }
 
 void HungRendererDialog::OnDialogClosed(const std::string& json_retval) {
-  if (is_enabled_) {
-    // Figure out what the response was.
-    scoped_ptr<Value> root(base::JSONReader::Read(json_retval, false));
-    bool response = false;
-    ListValue* list = NULL;
-    // If the dialog closes because of a button click then the json is a list
-    // containing a single bool.  If the dialog closes some other way, then we
-    // assume it means no permission was given to kill tabs.
-    if (root.get() && root->GetAsList(&list) && list &&
-        list->GetBoolean(0, &response) && response) {
-      // The user indicated that it is OK to kill the renderer process.
-      if (contents_ && contents_->GetRenderProcessHost()) {
-        base::KillProcess(contents_->GetRenderProcessHost()->GetHandle(),
-                          content::RESULT_CODE_HUNG, false);
-      }
-    } else {
-      // No indication from the user that it is ok to kill anything. Just wait.
-      // Start waiting again for responsiveness.
-      if (contents_ && contents_->render_view_host())
-        contents_->render_view_host()->RestartHangMonitorTimeout();
+  // Figure out what the response was.
+  scoped_ptr<Value> root(base::JSONReader::Read(json_retval, false));
+  bool response = false;
+  ListValue* list = NULL;
+  // If the dialog closes because of a button click then the json is a list
+  // containing a single bool.  If the dialog closes some other way, then we
+  // assume it means no permission was given to kill tabs.
+  if (root.get() && root->GetAsList(&list) && list &&
+      list->GetBoolean(0, &response) && response) {
+    // The user indicated that it is OK to kill the renderer process.
+    if (contents_ && contents_->GetRenderProcessHost()) {
+      base::KillProcess(contents_->GetRenderProcessHost()->GetHandle(),
+                        content::RESULT_CODE_HUNG, false);
     }
+  } else {
+    // No indication from the user that it is ok to kill anything. Just wait.
+    // Start waiting again for responsiveness.
+    if (contents_ && contents_->render_view_host())
+      contents_->render_view_host()->RestartHangMonitorTimeout();
   }
   g_instance = NULL;
   delete this;
 }
 
 void HungRendererDialog::OnCloseContents(TabContents* source,
                      bool* out_close_dialog) {
   NOTIMPLEMENTED();
 }
 
@@ skipping 33 matching lines @@
       DictionaryValue* dict = new DictionaryValue();
       dict->SetString("url", it->tab_contents()->GetURL().spec());
       dict->SetString("title", title);
       tab_contents_list.Append(dict);
     }
   }
   // Send list of tab contents details to javascript.
   web_ui_->CallJavascriptFunction("hungRendererDialog.setTabContentsList",
                                   tab_contents_list);
 }