OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/file_util.h" | 6 #include "base/file_util.h" |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
10 #include "base/test/trace_event_analyzer.h" | 10 #include "base/test/trace_event_analyzer.h" |
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
206 IN_PROC_BROWSER_TEST_F(GpuCompositingBlockedTest, GpuCompositingBlocked) { | 206 IN_PROC_BROWSER_TEST_F(GpuCompositingBlockedTest, GpuCompositingBlocked) { |
207 EXPECT_TRUE(GpuDataManager::GetInstance()->IsFeatureBlacklisted( | 207 EXPECT_TRUE(GpuDataManager::GetInstance()->IsFeatureBlacklisted( |
208 gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING)); | 208 gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING)); |
209 } | 209 } |
210 | 210 |
211 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLAllowed) { | 211 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLAllowed) { |
212 EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted( | 212 EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted( |
213 gpu::GPU_FEATURE_TYPE_WEBGL)); | 213 gpu::GPU_FEATURE_TYPE_WEBGL)); |
214 | 214 |
215 // The below times out: http://crbug.com/166060 | 215 // The below times out: http://crbug.com/166060 |
216 return; | 216 #if 0 |
217 | |
218 const base::FilePath url(FILE_PATH_LITERAL("feature_webgl.html")); | 217 const base::FilePath url(FILE_PATH_LITERAL("feature_webgl.html")); |
219 RunEventTest(url, kWebGLCreationEvent, true); | 218 RunEventTest(url, kWebGLCreationEvent, true); |
| 219 #endif |
220 } | 220 } |
221 | 221 |
222 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) { | 222 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) { |
223 const std::string json_blacklist = | 223 const std::string json_blacklist = |
224 "{\n" | 224 "{\n" |
225 " \"name\": \"gpu blacklist\",\n" | 225 " \"name\": \"gpu blacklist\",\n" |
226 " \"version\": \"1.0\",\n" | 226 " \"version\": \"1.0\",\n" |
227 " \"entries\": [\n" | 227 " \"entries\": [\n" |
228 " {\n" | 228 " {\n" |
229 " \"id\": 1,\n" | 229 " \"id\": 1,\n" |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
503 "%d (resize offset %d): IOSurface width %d -> %d; Creates %d " | 503 "%d (resize offset %d): IOSurface width %d -> %d; Creates %d " |
504 "Expected %d", offset_i, offsets[offset_i], | 504 "Expected %d", offset_i, offsets[offset_i], |
505 old_width, new_width, num_creates, expected_creates); | 505 old_width, new_width, num_creates, expected_creates); |
506 } | 506 } |
507 } | 507 } |
508 LOG(INFO) << "finished test"; | 508 LOG(INFO) << "finished test"; |
509 } | 509 } |
510 #endif | 510 #endif |
511 | 511 |
512 } // namespace | 512 } // namespace |
OLD | NEW |