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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 GURL full_url = test_server()->GetURL(url.append(filename)); | 78 GURL full_url = test_server()->GetURL(url.append(filename)); |
79 NavigateToURL(shell(), full_url); | 79 NavigateToURL(shell(), full_url); |
80 } else { | 80 } else { |
81 NavigateToURL(shell(), | 81 NavigateToURL(shell(), |
82 GetFileUrlWithQuery(gpu_test_dir_.AppendASCII(filename), | 82 GetFileUrlWithQuery(gpu_test_dir_.AppendASCII(filename), |
83 "")); | 83 "")); |
84 } | 84 } |
85 | 85 |
86 bool result = false; | 86 bool result = false; |
87 BrowserThread::PostTaskAndReply( | 87 BrowserThread::PostTaskAndReply( |
88 BrowserThread::IO, FROM_HERE, | 88 BrowserThread::IO, |
| 89 FROM_HERE, |
89 base::Bind(&VerifyGPUProcessLaunch, &result), | 90 base::Bind(&VerifyGPUProcessLaunch, &result), |
90 MessageLoop::QuitClosure()); | 91 base::MessageLoop::QuitClosure()); |
91 MessageLoop::current()->Run(); | 92 base::MessageLoop::current()->Run(); |
92 EXPECT_TRUE(result); | 93 EXPECT_TRUE(result); |
93 } | 94 } |
94 | 95 |
95 base::FilePath gpu_test_dir_; | 96 base::FilePath gpu_test_dir_; |
96 }; | 97 }; |
97 | 98 |
98 IN_PROC_BROWSER_TEST_F(GpuFunctionalTest, | 99 IN_PROC_BROWSER_TEST_F(GpuFunctionalTest, |
99 MANUAL_TestFeatureHardwareAccelerated) { | 100 MANUAL_TestFeatureHardwareAccelerated) { |
100 VerifyHardwareAccelerated("WebGL: "); | 101 VerifyHardwareAccelerated("WebGL: "); |
101 VerifyHardwareAccelerated("Canvas: "); | 102 VerifyHardwareAccelerated("Canvas: "); |
(...skipping 18 matching lines...) Expand all Loading... |
120 // TestGpuWithVideo is failing on all platforms | 121 // TestGpuWithVideo is failing on all platforms |
121 // http://crbug.com/237208 | 122 // http://crbug.com/237208 |
122 #define MANUAL_TestGpuWithVideo DISABLED_MANUAL_TestGpuWithVideo | 123 #define MANUAL_TestGpuWithVideo DISABLED_MANUAL_TestGpuWithVideo |
123 | 124 |
124 // Verify that gpu process is started when viewing video. | 125 // Verify that gpu process is started when viewing video. |
125 IN_PROC_BROWSER_TEST_F(GpuFunctionalTest, MANUAL_TestGpuWithVideo) { | 126 IN_PROC_BROWSER_TEST_F(GpuFunctionalTest, MANUAL_TestGpuWithVideo) { |
126 VerifyGPUProcessOnPage("functional_color2.ogv", false); | 127 VerifyGPUProcessOnPage("functional_color2.ogv", false); |
127 } | 128 } |
128 | 129 |
129 } // namespace content | 130 } // namespace content |
OLD | NEW |