Chromium Code Reviews| 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 <utility> | 6 #include <utility> |
| 7 | 7 |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 2411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2422 WebViewCaptureTest() {} | 2422 WebViewCaptureTest() {} |
| 2423 ~WebViewCaptureTest() override {} | 2423 ~WebViewCaptureTest() override {} |
| 2424 void SetUp() override { | 2424 void SetUp() override { |
| 2425 EnablePixelOutput(); | 2425 EnablePixelOutput(); |
| 2426 WebViewTest::SetUp(); | 2426 WebViewTest::SetUp(); |
| 2427 } | 2427 } |
| 2428 }; | 2428 }; |
| 2429 INSTANTIATE_TEST_CASE_P(WebViewTests, WebViewCaptureTest, testing::Bool()); | 2429 INSTANTIATE_TEST_CASE_P(WebViewTests, WebViewCaptureTest, testing::Bool()); |
| 2430 | 2430 |
| 2431 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestZoomAPI) { | 2431 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestZoomAPI) { |
| 2432 // TODO(wjmaclean): This test is broken, but only when the | |
| 2433 // --use-cross-process-frames-for-guests flag is specified. This needs to be | |
| 2434 // fixed. See also comment in | |
| 2435 // CrossProcessFrameConnector::OnFrameRectChanged(). | |
| 2436 // http://crbug.com/607978 | |
| 2437 if (!GetParam()) | |
| 2438 TestHelper("testZoomAPI", "web_view/shim", NO_TEST_SERVER); | 2432 TestHelper("testZoomAPI", "web_view/shim", NO_TEST_SERVER); |
|
nasko
2016/05/04 21:58:58
Need to fix indent after removal of the if stateme
wjmaclean
2016/05/05 15:40:56
Ooops! :-)
Fixed.
| |
| 2439 } | 2433 } |
| 2440 | 2434 |
| 2441 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestFindAPI) { | 2435 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestFindAPI) { |
| 2442 TestHelper("testFindAPI", "web_view/shim", NO_TEST_SERVER); | 2436 TestHelper("testFindAPI", "web_view/shim", NO_TEST_SERVER); |
| 2443 } | 2437 } |
| 2444 | 2438 |
| 2445 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestFindAPI_findupdate) { | 2439 IN_PROC_BROWSER_TEST_P(WebViewTest, Shim_TestFindAPI_findupdate) { |
| 2446 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); | 2440 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); |
| 2447 } | 2441 } |
| 2448 | 2442 |
| (...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3097 // 4 tasks expected. The order is arbitrary. | 3091 // 4 tasks expected. The order is arbitrary. |
| 3098 // Tab: about:blank, | 3092 // Tab: about:blank, |
| 3099 // Background Page: <webview> task manager test, | 3093 // Background Page: <webview> task manager test, |
| 3100 // App: <webview> task manager test, | 3094 // App: <webview> task manager test, |
| 3101 // Webview: WebViewed test content. | 3095 // Webview: WebViewed test content. |
| 3102 EXPECT_EQ(4U, task_manager.tasks().size()); | 3096 EXPECT_EQ(4U, task_manager.tasks().size()); |
| 3103 EXPECT_TRUE(HasExpectedGuestTask(task_manager, guest_contents)); | 3097 EXPECT_TRUE(HasExpectedGuestTask(task_manager, guest_contents)); |
| 3104 } | 3098 } |
| 3105 | 3099 |
| 3106 #endif // defined(ENABLE_TASK_MANAGER) | 3100 #endif // defined(ENABLE_TASK_MANAGER) |
| OLD | NEW |