| 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 739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 750 | 750 |
| 751 class WebViewSizeTest : public WebViewTest {}; | 751 class WebViewSizeTest : public WebViewTest {}; |
| 752 INSTANTIATE_TEST_CASE_P(WebViewTests, WebViewSizeTest, testing::Values(false)); | 752 INSTANTIATE_TEST_CASE_P(WebViewTests, WebViewSizeTest, testing::Values(false)); |
| 753 | 753 |
| 754 class WebViewSpeechAPITest : public WebViewTest {}; | 754 class WebViewSpeechAPITest : public WebViewTest {}; |
| 755 INSTANTIATE_TEST_CASE_P(WebViewTests, | 755 INSTANTIATE_TEST_CASE_P(WebViewTests, |
| 756 WebViewSpeechAPITest, | 756 WebViewSpeechAPITest, |
| 757 testing::Values(false)); | 757 testing::Values(false)); |
| 758 | 758 |
| 759 class WebViewVisibilityTest : public WebViewTest {}; | 759 class WebViewVisibilityTest : public WebViewTest {}; |
| 760 INSTANTIATE_TEST_CASE_P(WebViewTests, | 760 INSTANTIATE_TEST_CASE_P(WebViewTests, WebViewVisibilityTest, testing::Bool()); |
| 761 WebViewVisibilityTest, | |
| 762 testing::Values(false)); | |
| 763 | 761 |
| 764 class WebViewDPITest : public WebViewTest { | 762 class WebViewDPITest : public WebViewTest { |
| 765 protected: | 763 protected: |
| 766 void SetUpCommandLine(base::CommandLine* command_line) override { | 764 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 767 WebViewTest::SetUpCommandLine(command_line); | 765 WebViewTest::SetUpCommandLine(command_line); |
| 768 command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor, | 766 command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor, |
| 769 base::StringPrintf("%f", scale())); | 767 base::StringPrintf("%f", scale())); |
| 770 } | 768 } |
| 771 | 769 |
| 772 static float scale() { return 2.0f; } | 770 static float scale() { return 2.0f; } |
| (...skipping 2338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3111 // 4 tasks expected. The order is arbitrary. | 3109 // 4 tasks expected. The order is arbitrary. |
| 3112 // Tab: about:blank, | 3110 // Tab: about:blank, |
| 3113 // Background Page: <webview> task manager test, | 3111 // Background Page: <webview> task manager test, |
| 3114 // App: <webview> task manager test, | 3112 // App: <webview> task manager test, |
| 3115 // Webview: WebViewed test content. | 3113 // Webview: WebViewed test content. |
| 3116 EXPECT_EQ(4U, task_manager.tasks().size()); | 3114 EXPECT_EQ(4U, task_manager.tasks().size()); |
| 3117 EXPECT_TRUE(HasExpectedGuestTask(task_manager, guest_contents)); | 3115 EXPECT_TRUE(HasExpectedGuestTask(task_manager, guest_contents)); |
| 3118 } | 3116 } |
| 3119 | 3117 |
| 3120 #endif // defined(ENABLE_TASK_MANAGER) | 3118 #endif // defined(ENABLE_TASK_MANAGER) |
| OLD | NEW |