| 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
| 10 #include "chrome/browser/extensions/bundle_installer.h" | 10 #include "chrome/browser/extensions/bundle_installer.h" |
| (...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 " ]\n" | 435 " ]\n" |
| 436 " }\n" | 436 " }\n" |
| 437 " ]\n" | 437 " ]\n" |
| 438 "}"; | 438 "}"; |
| 439 GpuBlacklist* blacklist = GpuBlacklist::GetInstance(); | 439 GpuBlacklist* blacklist = GpuBlacklist::GetInstance(); |
| 440 | 440 |
| 441 ASSERT_TRUE(blacklist->LoadGpuBlacklist( | 441 ASSERT_TRUE(blacklist->LoadGpuBlacklist( |
| 442 json_blacklist, GpuBlacklist::kAllOs)); | 442 json_blacklist, GpuBlacklist::kAllOs)); |
| 443 blacklist->UpdateGpuDataManager(); | 443 blacklist->UpdateGpuDataManager(); |
| 444 GpuFeatureType type = | 444 GpuFeatureType type = |
| 445 content::GpuDataManager::GetInstance()->GetGpuFeatureType(); | 445 content::GpuDataManager::GetInstance()->GetBlacklistedFeatures(); |
| 446 EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL); | 446 EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL); |
| 447 | 447 |
| 448 bool webgl_allowed = false; | 448 bool webgl_allowed = false; |
| 449 RunTest(webgl_allowed); | 449 RunTest(webgl_allowed); |
| 450 } | 450 } |
| 451 | 451 |
| 452 } // namespace extensions | 452 } // namespace extensions |
| OLD | NEW |