Fix DevToolsBeforeUnloadTest and BrowserCloseManagerBrowserTest.

chrome/browser/devtools/devtools_sanity_browsertest.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 <stddef.h>
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/cancelable_callback.h"
@@ skipping 34 matching lines @@
 #include "chrome/test/base/test_chrome_web_ui_controller_factory.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/app_modal/javascript_app_modal_dialog.h"
 #include "components/app_modal/native_app_modal_dialog.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "content/public/browser/worker_service.h"
 #include "content/public/browser/worker_service_observer.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 291 matching lines @@
 
 void DevToolsWindowBeforeUnloadObserver::BeforeUnloadFired(
     const base::TimeTicks& proceed_time) {
   m_fired = true;
   if (message_loop_runner_.get())
     message_loop_runner_->Quit();
 }
 
 class DevToolsBeforeUnloadTest: public DevToolsSanityTest {
  public:
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    command_line->AppendSwitch(
-        switches::kDisableHangMonitor);
-  }
-
   void CloseInspectedTab() {
     browser()->tab_strip_model()->CloseWebContentsAt(0,
         TabStripModel::CLOSE_NONE);
   }
 
   void CloseDevToolsWindowAsync() {
     DevToolsWindowTesting::CloseDevToolsWindow(window_);
   }
 
   void CloseInspectedBrowser() {
     chrome::CloseWindow(browser());
   }
 
  protected:
   void InjectBeforeUnloadListener(content::WebContents* web_contents) {
     ASSERT_TRUE(content::ExecuteScript(web_contents->GetRenderViewHost(),
         "window.addEventListener('beforeunload',"
         "function(event) { event.returnValue = 'Foo'; });"));
   }
 
   void RunBeforeUnloadSanityTest(bool is_docked,
                                  base::Callback<void(void)> close_method,
                                  bool wait_for_browser_close = true) {
     OpenDevToolsWindow(kDebuggerTestPage, is_docked);
     scoped_refptr<content::MessageLoopRunner> runner =
         new content::MessageLoopRunner;
     DevToolsWindowTesting::Get(window_)->
         SetCloseCallback(runner->QuitClosure());
     InjectBeforeUnloadListener(main_web_contents());
+    main_web_contents()
+        ->GetMainFrame()
+        ->DisableBeforeUnloadHangMonitorForTesting();
     {
       DevToolsWindowBeforeUnloadObserver before_unload_observer(window_);
       close_method.Run();
       CancelModalDialog();
       before_unload_observer.Wait();
     }
     {
       content::WindowedNotificationObserver close_observer(
           chrome::NOTIFICATION_BROWSER_CLOSED,
           content::Source<Browser>(browser()));
@@ skipping 41 matching lines @@
     AppModalDialog* dialog = ui_test_utils::WaitForAppModalDialog();
     EXPECT_TRUE(dialog->IsJavaScriptModalDialog());
     JavaScriptAppModalDialog* js_dialog =
         static_cast<JavaScriptAppModalDialog*>(dialog);
     NativeAppModalDialog* native_dialog = js_dialog->native_dialog();
     EXPECT_TRUE(native_dialog);
     return native_dialog;
   }
 };
 
-class DevToolsUnresponsiveBeforeUnloadTest: public DevToolsBeforeUnloadTest {
- public:
-  void SetUpCommandLine(base::CommandLine* command_line) override {}
-};
-
 void TimeoutCallback(const std::string& timeout_message) {
   ADD_FAILURE() << timeout_message;
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
 // Base class for DevTools tests that test devtools functionality for
 // extensions and content scripts.
 class DevToolsExtensionTest : public DevToolsSanityTest,
                               public content::NotificationObserver {
  public:
@@ skipping 228 matching lines @@
 // Tests that BeforeUnload event gets called on docked devtools if
 // we try to close them.
 IN_PROC_BROWSER_TEST_F(DevToolsBeforeUnloadTest, TestDockedDevToolsClose) {
   RunBeforeUnloadSanityTest(true, base::Bind(
       &DevToolsBeforeUnloadTest::CloseDevToolsWindowAsync,
       base::Unretained(this)), false);
 }
 
 // Tests that BeforeUnload event gets called on docked devtools if
 // we try to close the inspected page.
-// Flaky on Windows, Linux and ChromiumOS.  http://crbug.com/702171
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-#define MAYBE_TestDockedDevToolsInspectedTabClose \
-  DISABLED_TestDockedDevToolsInspectedTabClose
-#else
-#define MAYBE_TestDockedDevToolsInspectedTabClose \
-  TestDockedDevToolsInspectedTabClose
-#endif
 IN_PROC_BROWSER_TEST_F(DevToolsBeforeUnloadTest,
-                       MAYBE_TestDockedDevToolsInspectedTabClose) {
+                       TestDockedDevToolsInspectedTabClose) {
   RunBeforeUnloadSanityTest(true, base::Bind(
       &DevToolsBeforeUnloadTest::CloseInspectedTab,
       base::Unretained(this)));
 }
 
 // Tests that BeforeUnload event gets called on docked devtools if
 // we try to close the inspected browser.
-// Flaky on Windows. http://crbug.com/702171
-#if defined(OS_WIN)
-#define MAYBE_TestDockedDevToolsInspectedBrowserClose \
-  DISABLED_TestDockedDevToolsInspectedBrowserClose
-#else
-#define MAYBE_TestDockedDevToolsInspectedBrowserClose \
-  TestDockedDevToolsInspectedBrowserClose
-#endif
 IN_PROC_BROWSER_TEST_F(DevToolsBeforeUnloadTest,
-                       MAYBE_TestDockedDevToolsInspectedBrowserClose) {
+                       TestDockedDevToolsInspectedBrowserClose) {
   RunBeforeUnloadSanityTest(true, base::Bind(
       &DevToolsBeforeUnloadTest::CloseInspectedBrowser,
       base::Unretained(this)));
 }
 
 // Tests that BeforeUnload event gets called on undocked devtools if
 // we try to close them.
-// Flaky on Windows, Linux and ChromiumOS.  http://crbug.com/702171
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-#define MAYBE_TestUndockedDevToolsClose DISABLED_TestUndockedDevToolsClose
-#else
-#define MAYBE_TestUndockedDevToolsClose TestUndockedDevToolsClose
-#endif
-IN_PROC_BROWSER_TEST_F(DevToolsBeforeUnloadTest,
-                       MAYBE_TestUndockedDevToolsClose) {
+IN_PROC_BROWSER_TEST_F(DevToolsBeforeUnloadTest, TestUndockedDevToolsClose) {
   RunBeforeUnloadSanityTest(false, base::Bind(
       &DevToolsBeforeUnloadTest::CloseDevToolsWindowAsync,
       base::Unretained(this)), false);
 }
 
 // Tests that BeforeUnload event gets called on undocked devtools if
 // we try to close the inspected page.
-// Flaky on Windows. http://crbug.com/702171
-#if defined(OS_WIN)
-#define MAYBE_TestUndockedDevToolsInspectedTabClose \
-  DISABLED_TestUndockedDevToolsInspectedTabClose
-#else
-#define MAYBE_TestUndockedDevToolsInspectedTabClose \
-  TestUndockedDevToolsInspectedTabClose
-#endif
 IN_PROC_BROWSER_TEST_F(DevToolsBeforeUnloadTest,
-                       MAYBE_TestUndockedDevToolsInspectedTabClose) {
+                       TestUndockedDevToolsInspectedTabClose) {
   RunBeforeUnloadSanityTest(false, base::Bind(
       &DevToolsBeforeUnloadTest::CloseInspectedTab,
       base::Unretained(this)));
 }
 
 // Tests that BeforeUnload event gets called on undocked devtools if
 // we try to close the inspected browser.
-// Flaky on Windows, Linux and ChromiumOS.  http://crbug.com/702171
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-#define MAYBE_TestUndockedDevToolsInspectedBrowserClose \
-  DISABLED_TestUndockedDevToolsInspectedBrowserClose
-#else
-#define MAYBE_TestUndockedDevToolsInspectedBrowserClose \
-  TestUndockedDevToolsInspectedBrowserClose
-#endif
 IN_PROC_BROWSER_TEST_F(DevToolsBeforeUnloadTest,
-                       MAYBE_TestUndockedDevToolsInspectedBrowserClose) {
+                       TestUndockedDevToolsInspectedBrowserClose) {
   RunBeforeUnloadSanityTest(false, base::Bind(
       &DevToolsBeforeUnloadTest::CloseInspectedBrowser,
       base::Unretained(this)));
 }
 
 // Tests that BeforeUnload event gets called on undocked devtools if
 // we try to exit application.
-// Flaky on Windows, Linux and ChromiumOS.  http://crbug.com/702171
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-#define MAYBE_TestUndockedDevToolsApplicationClose \
-  DISABLED_TestUndockedDevToolsApplicationClose
-#else
-#define MAYBE_TestUndockedDevToolsApplicationClose \
-  TestUndockedDevToolsApplicationClose
-#endif
 IN_PROC_BROWSER_TEST_F(DevToolsBeforeUnloadTest,
-                       MAYBE_TestUndockedDevToolsApplicationClose) {
+                       TestUndockedDevToolsApplicationClose) {
   RunBeforeUnloadSanityTest(false, base::Bind(
       &chrome::CloseAllBrowsers));
 }
 
 // Tests that inspected tab gets closed if devtools renderer
 // becomes unresponsive during beforeunload event interception.
 // @see http://crbug.com/322380
 // Disabled because of http://crbug.com/410327
-IN_PROC_BROWSER_TEST_F(DevToolsUnresponsiveBeforeUnloadTest,
+IN_PROC_BROWSER_TEST_F(DevToolsBeforeUnloadTest,
                        DISABLED_TestUndockedDevToolsUnresponsive) {
   ASSERT_TRUE(spawned_test_server()->Start());
   LoadTestPage(kDebuggerTestPage);
   DevToolsWindow* devtools_window = OpenDevToolWindowOnWebContents(
       GetInspectedTab(), false);
 
   scoped_refptr<content::MessageLoopRunner> runner =
       new content::MessageLoopRunner;
   DevToolsWindowTesting::Get(devtools_window)->SetCloseCallback(
       runner->QuitClosure());
@@ skipping 768 matching lines @@
   RunTestFunction(window, "testWindowInitializedOnNavigateBack");
 
   DevToolsWindowTesting::CloseDevToolsWindowSync(window);
   content::WebUIControllerFactory::UnregisterFactoryForTesting(&test_factory);
 }
 
 // Tests scripts panel showing.
 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestDevToolsSharedWorker) {
   RunTest("testDevToolsSharedWorker", url::kAboutBlankURL);
 }