| 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 1288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1299 #define MAYBE_Shim_TestChromeExtensionRelativePath \ | 1299 #define MAYBE_Shim_TestChromeExtensionRelativePath \ |
| 1300 Shim_TestChromeExtensionRelativePath | 1300 Shim_TestChromeExtensionRelativePath |
| 1301 #endif | 1301 #endif |
| 1302 IN_PROC_BROWSER_TEST_P(WebViewTest, | 1302 IN_PROC_BROWSER_TEST_P(WebViewTest, |
| 1303 MAYBE_Shim_TestChromeExtensionRelativePath) { | 1303 MAYBE_Shim_TestChromeExtensionRelativePath) { |
| 1304 TestHelper("testChromeExtensionRelativePath", | 1304 TestHelper("testChromeExtensionRelativePath", |
| 1305 "web_view/shim", | 1305 "web_view/shim", |
| 1306 NO_TEST_SERVER); | 1306 NO_TEST_SERVER); |
| 1307 } | 1307 } |
| 1308 | 1308 |
| 1309 IN_PROC_BROWSER_TEST_P(WebViewTest, |
| 1310 Shim_TestContentInitiatedNavigationToDataUrlBlocked) { |
| 1311 TestHelper("testContentInitiatedNavigationToDataUrlBlocked", "web_view/shim", |
| 1312 NO_TEST_SERVER); |
| 1313 } |
| 1314 |
| 1309 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestDisplayNoneWebviewLoad) { | 1315 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestDisplayNoneWebviewLoad) { |
| 1310 TestHelper("testDisplayNoneWebviewLoad", "web_view/shim", NO_TEST_SERVER); | 1316 TestHelper("testDisplayNoneWebviewLoad", "web_view/shim", NO_TEST_SERVER); |
| 1311 } | 1317 } |
| 1312 | 1318 |
| 1313 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestDisplayNoneWebviewRemoveChild) { | 1319 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestDisplayNoneWebviewRemoveChild) { |
| 1314 // http://crbug.com/585652 | 1320 // http://crbug.com/585652 |
| 1315 if (base::FeatureList::IsEnabled(::features::kGuestViewCrossProcessFrames)) | 1321 if (base::FeatureList::IsEnabled(::features::kGuestViewCrossProcessFrames)) |
| 1316 return; | 1322 return; |
| 1317 TestHelper("testDisplayNoneWebviewRemoveChild", | 1323 TestHelper("testDisplayNoneWebviewRemoveChild", |
| 1318 "web_view/shim", NO_TEST_SERVER); | 1324 "web_view/shim", NO_TEST_SERVER); |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1438 #define MAYBE_Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsChanged \ | 1444 #define MAYBE_Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsChanged \ |
| 1439 DISABLED_Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsChanged | 1445 DISABLED_Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsChanged |
| 1440 #else | 1446 #else |
| 1441 #define MAYBE_Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsChanged \ | 1447 #define MAYBE_Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsChanged \ |
| 1442 Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsChanged | 1448 Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsChanged |
| 1443 #endif | 1449 #endif |
| 1444 IN_PROC_BROWSER_TEST_P( | 1450 IN_PROC_BROWSER_TEST_P( |
| 1445 WebViewTest, | 1451 WebViewTest, |
| 1446 MAYBE_Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsChanged) { | 1452 MAYBE_Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsChanged) { |
| 1447 TestHelper("testExecuteScriptIsAbortedWhenWebViewSourceIsChanged", | 1453 TestHelper("testExecuteScriptIsAbortedWhenWebViewSourceIsChanged", |
| 1448 "web_view/shim", | 1454 "web_view/shim", NEEDS_TEST_SERVER); |
| 1449 NO_TEST_SERVER); | |
| 1450 } | 1455 } |
| 1451 | 1456 |
| 1452 IN_PROC_BROWSER_TEST_P( | 1457 IN_PROC_BROWSER_TEST_P( |
| 1453 WebViewTest, | 1458 WebViewTest, |
| 1454 Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsInvalid) { | 1459 Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsInvalid) { |
| 1455 TestHelper("testExecuteScriptIsAbortedWhenWebViewSourceIsInvalid", | 1460 TestHelper("testExecuteScriptIsAbortedWhenWebViewSourceIsInvalid", |
| 1456 "web_view/shim", | 1461 "web_view/shim", |
| 1457 NO_TEST_SERVER); | 1462 NO_TEST_SERVER); |
| 1458 } | 1463 } |
| 1459 | 1464 |
| (...skipping 2539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3999 ClosingChromeSignInShouldNotCrash) { | 4004 ClosingChromeSignInShouldNotCrash) { |
| 4000 GURL signin_url{"chrome://chrome-signin"}; | 4005 GURL signin_url{"chrome://chrome-signin"}; |
| 4001 | 4006 |
| 4002 AddTabAtIndex(0, signin_url, ui::PAGE_TRANSITION_TYPED); | 4007 AddTabAtIndex(0, signin_url, ui::PAGE_TRANSITION_TYPED); |
| 4003 AddTabAtIndex(1, signin_url, ui::PAGE_TRANSITION_TYPED); | 4008 AddTabAtIndex(1, signin_url, ui::PAGE_TRANSITION_TYPED); |
| 4004 WaitForWebViewInDom(); | 4009 WaitForWebViewInDom(); |
| 4005 | 4010 |
| 4006 chrome::CloseTab(browser()); | 4011 chrome::CloseTab(browser()); |
| 4007 } | 4012 } |
| 4008 #endif | 4013 #endif |
| OLD | NEW |