Index: gpu/config/gpu_control_list_unittest.cc |
diff --git a/gpu/config/gpu_control_list_unittest.cc b/gpu/config/gpu_control_list_unittest.cc |
index 9ba06b897aa472cd3cf84ef1748faf36fbb9770a..d67d67751e74c02cff8a0f6d959508103c76079b 100644 |
--- a/gpu/config/gpu_control_list_unittest.cc |
+++ b/gpu/config/gpu_control_list_unittest.cc |
@@ -289,6 +289,44 @@ TEST_F(GpuControlListTest, DisabledEntry) { |
EXPECT_EQ(1u, flag_entries.size()); |
} |
+TEST_F(GpuControlListTest, NeedsMoreInfo) { |
+ const std::string json = LONG_STRING_CONST( |
+ { |
+ "name": "gpu control list", |
+ "version": "0.1", |
+ "entries": [ |
+ { |
+ "id": 1, |
+ "os": { |
+ "type": "win" |
+ }, |
+ "vendor_id": "0x10de", |
+ "driver_version": { |
+ "op": "<", |
+ "value": "12" |
+ }, |
+ "features": [ |
+ "test_feature_0" |
+ ] |
+ } |
+ ] |
+ } |
+ ); |
+ GPUInfo gpu_info; |
+ gpu_info.gpu.vendor_id = kNvidiaVendorId; |
+ |
+ scoped_ptr<GpuControlList> control_list(Create()); |
+ EXPECT_TRUE(control_list->LoadList(json, GpuControlList::kAllOs)); |
+ |
+ std::set<int> features = control_list->MakeDecision( |
+ GpuControlList::kOsWin, kOsVersion, gpu_info); |
+ EXPECT_EMPTY_SET(features); |
+ EXPECT_TRUE(control_list->needs_more_info()); |
+ std::vector<uint32> decision_entries; |
+ control_list->GetDecisionEntries(&decision_entries, false); |
+ EXPECT_EQ(0u, decision_entries.size()); |
Zhenyao Mo
2014/08/26 02:45:15
Before the change, this test fails (returns 1 inst
Ken Russell (switch to Gerrit)
2014/08/26 20:49:21
OK, sounds good. But should the test also verify t
Zhenyao Mo
2014/08/27 03:44:05
Done.
|
+} |
+ |
TEST_F(GpuControlListTest, NeedsMoreInfoForExceptions) { |
const std::string json = LONG_STRING_CONST( |
{ |