| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <queue> | 5 #include <queue> |
| 6 #include <set> | 6 #include <set> |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
| 10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
| (...skipping 1523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1534 IN_PROC_BROWSER_TEST_P(WebViewTest, InterstitialTeardown) { | 1534 IN_PROC_BROWSER_TEST_P(WebViewTest, InterstitialTeardown) { |
| 1535 InterstitialTeardownTestHelper(); | 1535 InterstitialTeardownTestHelper(); |
| 1536 | 1536 |
| 1537 // Now close the app while interstitial page being shown in guest. | 1537 // Now close the app while interstitial page being shown in guest. |
| 1538 extensions::AppWindow* window = GetFirstAppWindow(); | 1538 extensions::AppWindow* window = GetFirstAppWindow(); |
| 1539 window->GetBaseWindow()->Close(); | 1539 window->GetBaseWindow()->Close(); |
| 1540 } | 1540 } |
| 1541 | 1541 |
| 1542 // This test makes sure the browser process does not crash if browser is shut | 1542 // This test makes sure the browser process does not crash if browser is shut |
| 1543 // down while an interstitial page is being shown in guest. | 1543 // down while an interstitial page is being shown in guest. |
| 1544 // Flaky on Windows. http://crbug.com/619508. | 1544 // Flaky. http://crbug.com/627962. |
| 1545 #if defined(OS_WIN) | |
| 1546 #define MAYBE_InterstitialTeardownOnBrowserShutdown \ | |
| 1547 DISABLED_InterstitialTeardownOnBrowserShutdown | |
| 1548 #else | |
| 1549 #define MAYBE_InterstitialTeardownOnBrowserShutdown \ | |
| 1550 InterstitialTeardownOnBrowserShutdown | |
| 1551 #endif | |
| 1552 IN_PROC_BROWSER_TEST_P(WebViewTest, | 1545 IN_PROC_BROWSER_TEST_P(WebViewTest, |
| 1553 MAYBE_InterstitialTeardownOnBrowserShutdown) { | 1546 DISABLED_InterstitialTeardownOnBrowserShutdown) { |
| 1554 InterstitialTeardownTestHelper(); | 1547 InterstitialTeardownTestHelper(); |
| 1555 | 1548 |
| 1556 // Now close the app while interstitial page being shown in guest. | 1549 // Now close the app while interstitial page being shown in guest. |
| 1557 extensions::AppWindow* window = GetFirstAppWindow(); | 1550 extensions::AppWindow* window = GetFirstAppWindow(); |
| 1558 window->GetBaseWindow()->Close(); | 1551 window->GetBaseWindow()->Close(); |
| 1559 | 1552 |
| 1560 // InterstitialPage is not destroyed immediately, so the | 1553 // InterstitialPage is not destroyed immediately, so the |
| 1561 // RenderWidgetHostViewGuest for it is still there, closing all | 1554 // RenderWidgetHostViewGuest for it is still there, closing all |
| 1562 // renderer processes will cause the RWHVGuest's RenderProcessGone() | 1555 // renderer processes will cause the RWHVGuest's RenderProcessGone() |
| 1563 // shutdown path to be exercised. | 1556 // shutdown path to be exercised. |
| (...skipping 2112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3676 gfx::Point embedder_origin = | 3669 gfx::Point embedder_origin = |
| 3677 GetEmbedderWebContents()->GetContainerBounds().origin(); | 3670 GetEmbedderWebContents()->GetContainerBounds().origin(); |
| 3678 guest_rect.Offset(-embedder_origin.x(), -embedder_origin.y()); | 3671 guest_rect.Offset(-embedder_origin.x(), -embedder_origin.y()); |
| 3679 | 3672 |
| 3680 // Generate and send synthetic touch event. | 3673 // Generate and send synthetic touch event. |
| 3681 content::SimulateTouchPressAt(GetEmbedderWebContents(), | 3674 content::SimulateTouchPressAt(GetEmbedderWebContents(), |
| 3682 guest_rect.CenterPoint()); | 3675 guest_rect.CenterPoint()); |
| 3683 EXPECT_TRUE(aura_webview->HasFocus()); | 3676 EXPECT_TRUE(aura_webview->HasFocus()); |
| 3684 } | 3677 } |
| 3685 #endif | 3678 #endif |
| OLD | NEW |