Commit e7d579a8 authored by Boris Yusupov's avatar Boris Yusupov Committed by Commit Bot

Fix test when browser window is not active while test running

It expects platform_util::IsWindowActive() before subcribe to renderer events
and it isn't necessary so for example at local execution or simulatesly running
several tests. Thus it should set window active and it is interactive ui test.

Change-Id: Ia2bfd487fc1fe33aee1c35e0bbee342b72ef6fe2
Reviewed-on: https://chromium-review.googlesource.com/936541Reviewed-by: default avatarMichael Wasserman <msw@chromium.org>
Commit-Queue: Boris Yusupov <boriay@yandex-team.ru>
Cr-Commit-Position: refs/heads/master@{#539761}
parent 1091a89d
......@@ -9,16 +9,17 @@
#include "chrome/browser/ui/tab_dialogs.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/test/test_browser_dialog.h"
#include "chrome/test/base/interactive_test_utils.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/test/browser_test_utils.h"
#include "net/dns/mock_host_resolver.h"
#include "ui/base/ui_features.h"
class HungRendererNavigationBrowserTest : public InProcessBrowserTest {
class HungRendererNavigationTest : public InProcessBrowserTest {
public:
HungRendererNavigationBrowserTest() {}
~HungRendererNavigationBrowserTest() override {}
HungRendererNavigationTest() {}
~HungRendererNavigationTest() override {}
protected:
void SetUpOnMainThread() override {
......@@ -26,15 +27,17 @@ class HungRendererNavigationBrowserTest : public InProcessBrowserTest {
}
private:
DISALLOW_COPY_AND_ASSIGN(HungRendererNavigationBrowserTest);
DISALLOW_COPY_AND_ASSIGN(HungRendererNavigationTest);
};
// Verify that a cross-process navigation will dismiss the hung renderer
// dialog so that we do not kill the new (responsive) process.
IN_PROC_BROWSER_TEST_F(HungRendererNavigationBrowserTest,
IN_PROC_BROWSER_TEST_F(HungRendererNavigationTest,
HungRendererWithCrossProcessNavigation) {
EXPECT_TRUE(embedded_test_server()->Start());
ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL("a.com", "/title1.html"));
content::WebContents* active_web_contents =
......
......@@ -771,7 +771,6 @@ test("browser_tests") {
"../browser/ui/extensions/hosted_app_browsertest.cc",
"../browser/ui/find_bar/find_bar_controller_browsertest.cc",
"../browser/ui/find_bar/find_bar_host_browsertest.cc",
"../browser/ui/hung_renderer/hung_renderer_browsertest.cc",
"../browser/ui/javascript_dialogs/javascript_dialog_browsertest.cc",
"../browser/ui/location_bar/location_bar_browsertest.cc",
"../browser/ui/login/login_handler_browsertest.cc",
......@@ -4532,6 +4531,7 @@ if (!is_android) {
"../browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc",
"../browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc",
"../browser/ui/find_bar/find_bar_host_interactive_uitest.cc",
"../browser/ui/hung_renderer/hung_renderer_interactive_uitest.cc",
"../browser/ui/omnibox/omnibox_view_browsertest.cc",
"../browser/ui/passwords/manage_passwords_test.cc",
"../browser/ui/passwords/manage_passwords_test.h",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment