| 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 1463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1474 | 1474 |
| 1475 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestNavigateAfterResize) { | 1475 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestNavigateAfterResize) { |
| 1476 TestHelper("testNavigateAfterResize", "web_view/shim", NO_TEST_SERVER); | 1476 TestHelper("testNavigateAfterResize", "web_view/shim", NO_TEST_SERVER); |
| 1477 } | 1477 } |
| 1478 | 1478 |
| 1479 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestNestedCrossOriginSubframes) { | 1479 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestNestedCrossOriginSubframes) { |
| 1480 TestHelper("testNestedCrossOriginSubframes", | 1480 TestHelper("testNestedCrossOriginSubframes", |
| 1481 "web_view/shim", NEEDS_TEST_SERVER); | 1481 "web_view/shim", NEEDS_TEST_SERVER); |
| 1482 } | 1482 } |
| 1483 | 1483 |
| 1484 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestNestedSubframes) { | 1484 #if defined(OS_MACOSX) |
| 1485 // Flaky on Mac. See https://crbug.com/674904. |
| 1486 #define MAYBE_Shim_TestNestedSubframes DISABLED_Shim_TestNestedSubframes |
| 1487 #else |
| 1488 #define MAYBE_Shim_TestNestedSubframes Shim_TestNestedSubframes |
| 1489 #endif |
| 1490 IN_PROC_BROWSER_TEST_P(WebViewTest, MAYBE_Shim_TestNestedSubframes) { |
| 1485 TestHelper("testNestedSubframes", "web_view/shim", NO_TEST_SERVER); | 1491 TestHelper("testNestedSubframes", "web_view/shim", NO_TEST_SERVER); |
| 1486 } | 1492 } |
| 1487 | 1493 |
| 1488 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestRemoveSrcAttribute) { | 1494 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestRemoveSrcAttribute) { |
| 1489 TestHelper("testRemoveSrcAttribute", "web_view/shim", NO_TEST_SERVER); | 1495 TestHelper("testRemoveSrcAttribute", "web_view/shim", NO_TEST_SERVER); |
| 1490 } | 1496 } |
| 1491 | 1497 |
| 1492 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestReassignSrcAttribute) { | 1498 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestReassignSrcAttribute) { |
| 1493 TestHelper("testReassignSrcAttribute", "web_view/shim", NO_TEST_SERVER); | 1499 TestHelper("testReassignSrcAttribute", "web_view/shim", NO_TEST_SERVER); |
| 1494 } | 1500 } |
| (...skipping 2414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3909 ClosingChromeSignInShouldNotCrash) { | 3915 ClosingChromeSignInShouldNotCrash) { |
| 3910 GURL signin_url{"chrome://chrome-signin"}; | 3916 GURL signin_url{"chrome://chrome-signin"}; |
| 3911 | 3917 |
| 3912 AddTabAtIndex(0, signin_url, ui::PAGE_TRANSITION_TYPED); | 3918 AddTabAtIndex(0, signin_url, ui::PAGE_TRANSITION_TYPED); |
| 3913 AddTabAtIndex(1, signin_url, ui::PAGE_TRANSITION_TYPED); | 3919 AddTabAtIndex(1, signin_url, ui::PAGE_TRANSITION_TYPED); |
| 3914 WaitForWebViewInDom(); | 3920 WaitForWebViewInDom(); |
| 3915 | 3921 |
| 3916 chrome::CloseTab(browser()); | 3922 chrome::CloseTab(browser()); |
| 3917 } | 3923 } |
| 3918 #endif | 3924 #endif |
| OLD | NEW |