OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "content/browser/gpu/gpu_process_host.h" | 7 #include "content/browser/gpu/gpu_process_host.h" |
8 #include "content/public/browser/browser_thread.h" | 8 #include "content/public/browser/browser_thread.h" |
9 #include "content/public/common/content_paths.h" | 9 #include "content/public/common/content_paths.h" |
10 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 javascript.append("\");"); | 63 javascript.append("\");"); |
64 std::string result; | 64 std::string result; |
65 EXPECT_TRUE(ExecuteScriptAndExtractString(shell()->web_contents(), | 65 EXPECT_TRUE(ExecuteScriptAndExtractString(shell()->web_contents(), |
66 javascript, | 66 javascript, |
67 &result)); | 67 &result)); |
68 EXPECT_EQ(result, "success"); | 68 EXPECT_EQ(result, "success"); |
69 } | 69 } |
70 } | 70 } |
71 | 71 |
72 void VerifyGPUProcessOnPage(std::string filename, bool wait) { | 72 void VerifyGPUProcessOnPage(std::string filename, bool wait) { |
73 Shell::Initialize(); | |
74 ASSERT_TRUE(test_server()->Start()); | 73 ASSERT_TRUE(test_server()->Start()); |
75 DOMMessageQueue message_queue; | 74 DOMMessageQueue message_queue; |
76 | 75 |
77 std::string url("files/gpu/"); | 76 std::string url("files/gpu/"); |
78 GURL full_url = test_server()->GetURL(url.append(filename)); | 77 GURL full_url = test_server()->GetURL(url.append(filename)); |
79 NavigateToURL(shell(), full_url); | 78 NavigateToURL(shell(), full_url); |
80 | 79 |
81 if (wait) { | 80 if (wait) { |
82 std::string result_string; | 81 std::string result_string; |
83 ASSERT_TRUE(message_queue.WaitForMessage(&result_string)); | 82 ASSERT_TRUE(message_queue.WaitForMessage(&result_string)); |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 #define MANUAL_TestGpuWithVideo DISABLED_TestGpuWithVideo | 133 #define MANUAL_TestGpuWithVideo DISABLED_TestGpuWithVideo |
135 #endif | 134 #endif |
136 | 135 |
137 // Verify that gpu process is started when viewing video. | 136 // Verify that gpu process is started when viewing video. |
138 IN_PROC_BROWSER_TEST_F(GpuFunctionalTest, | 137 IN_PROC_BROWSER_TEST_F(GpuFunctionalTest, |
139 MANUAL_TestGpuWithVideo) { | 138 MANUAL_TestGpuWithVideo) { |
140 VerifyGPUProcessOnPage("functional_video.html", true); | 139 VerifyGPUProcessOnPage("functional_video.html", true); |
141 } | 140 } |
142 | 141 |
143 } // namespace content | 142 } // namespace content |
OLD | NEW |