| 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/base_paths.h" | 7 #include "base/base_paths.h" |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 12 #include "base/version.h" | 12 #include "base/version.h" |
| 13 #include "chrome/browser/gpu_blacklist.h" | 13 #include "content/browser/gpu/gpu_blacklist.h" |
| 14 #include "content/public/browser/gpu_data_manager.h" | |
| 15 #include "content/public/common/gpu_info.h" | 14 #include "content/public/common/gpu_info.h" |
| 16 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
| 17 | 16 |
| 18 using content::GpuFeatureType; | 17 using content::GpuFeatureType; |
| 19 | 18 |
| 20 class GpuBlacklistTest : public testing::Test { | 19 class GpuBlacklistTest : public testing::Test { |
| 21 public: | 20 public: |
| 22 GpuBlacklistTest() { } | 21 GpuBlacklistTest() { } |
| 23 | 22 |
| 24 virtual ~GpuBlacklistTest() { } | 23 virtual ~GpuBlacklistTest() { } |
| (...skipping 951 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 976 Version os_version("10.6.4"); | 975 Version os_version("10.6.4"); |
| 977 | 976 |
| 978 scoped_ptr<GpuBlacklist> blacklist(Create()); | 977 scoped_ptr<GpuBlacklist> blacklist(Create()); |
| 979 EXPECT_TRUE(blacklist->LoadGpuBlacklist( | 978 EXPECT_TRUE(blacklist->LoadGpuBlacklist( |
| 980 video_decode_json, GpuBlacklist::kAllOs)); | 979 video_decode_json, GpuBlacklist::kAllOs)); |
| 981 GpuFeatureType type = blacklist->DetermineGpuFeatureType( | 980 GpuFeatureType type = blacklist->DetermineGpuFeatureType( |
| 982 GpuBlacklist::kOsMacosx, &os_version, gpu_info()); | 981 GpuBlacklist::kOsMacosx, &os_version, gpu_info()); |
| 983 EXPECT_EQ(type, content::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE); | 982 EXPECT_EQ(type, content::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE); |
| 984 } | 983 } |
| 985 | 984 |
| OLD | NEW |