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 1420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1431 } | 1431 } |
1432 | 1432 |
1433 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestExecuteScriptFail) { | 1433 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestExecuteScriptFail) { |
1434 TestHelper("testExecuteScriptFail", "web_view/shim", NEEDS_TEST_SERVER); | 1434 TestHelper("testExecuteScriptFail", "web_view/shim", NEEDS_TEST_SERVER); |
1435 } | 1435 } |
1436 | 1436 |
1437 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestExecuteScript) { | 1437 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestExecuteScript) { |
1438 TestHelper("testExecuteScript", "web_view/shim", NO_TEST_SERVER); | 1438 TestHelper("testExecuteScript", "web_view/shim", NO_TEST_SERVER); |
1439 } | 1439 } |
1440 | 1440 |
1441 // Flaky on Linux. See https://crbug.com/703727. | 1441 // Flaky and likely not testing the right assertion. https://crbug.com/703727 |
1442 #if defined(OS_LINUX) | |
1443 #define MAYBE_Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsChanged \ | |
1444 DISABLED_Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsChanged | |
1445 #else | |
1446 #define MAYBE_Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsChanged \ | |
1447 Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsChanged | |
1448 #endif | |
1449 IN_PROC_BROWSER_TEST_P( | 1442 IN_PROC_BROWSER_TEST_P( |
1450 WebViewTest, | 1443 WebViewTest, |
1451 MAYBE_Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsChanged) { | 1444 DISABLED_Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsChanged) { |
1452 TestHelper("testExecuteScriptIsAbortedWhenWebViewSourceIsChanged", | 1445 TestHelper("testExecuteScriptIsAbortedWhenWebViewSourceIsChanged", |
1453 "web_view/shim", | 1446 "web_view/shim", |
1454 NO_TEST_SERVER); | 1447 NO_TEST_SERVER); |
1455 } | 1448 } |
1456 | 1449 |
1457 IN_PROC_BROWSER_TEST_P( | 1450 IN_PROC_BROWSER_TEST_P( |
1458 WebViewTest, | 1451 WebViewTest, |
1459 Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsInvalid) { | 1452 Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsInvalid) { |
1460 TestHelper("testExecuteScriptIsAbortedWhenWebViewSourceIsInvalid", | 1453 TestHelper("testExecuteScriptIsAbortedWhenWebViewSourceIsInvalid", |
1461 "web_view/shim", | 1454 "web_view/shim", |
(...skipping 2546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4008 ClosingChromeSignInShouldNotCrash) { | 4001 ClosingChromeSignInShouldNotCrash) { |
4009 GURL signin_url{"chrome://chrome-signin"}; | 4002 GURL signin_url{"chrome://chrome-signin"}; |
4010 | 4003 |
4011 AddTabAtIndex(0, signin_url, ui::PAGE_TRANSITION_TYPED); | 4004 AddTabAtIndex(0, signin_url, ui::PAGE_TRANSITION_TYPED); |
4012 AddTabAtIndex(1, signin_url, ui::PAGE_TRANSITION_TYPED); | 4005 AddTabAtIndex(1, signin_url, ui::PAGE_TRANSITION_TYPED); |
4013 WaitForWebViewInDom(); | 4006 WaitForWebViewInDom(); |
4014 | 4007 |
4015 chrome::CloseTab(browser()); | 4008 chrome::CloseTab(browser()); |
4016 } | 4009 } |
4017 #endif | 4010 #endif |
OLD | NEW |