GpuControlListEntry might need more info for gl_version as well

gpu/config/gpu_control_list_entry_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/json/json_reader.h"
 #include "gpu/config/gpu_control_list.h"
@@ skipping 781 matching lines @@
 
   GPUInfo gpu_info;
   gpu_info.gpu.vendor_id = 0x8086;
   EXPECT_TRUE(entry->NeedsMoreInfo(gpu_info, true));
   EXPECT_FALSE(entry->NeedsMoreInfo(gpu_info, false));
 
   gpu_info.gl_renderer = "mesa";
   EXPECT_FALSE(entry->NeedsMoreInfo(gpu_info, true));
 }
 
+TEST_F(GpuControlListEntryTest, NeedsMoreInfoForGlVersionEntry) {
+  const std::string json = LONG_STRING_CONST(
+      {
+        "id" : 1,
+        "gl_type": "gl",
+        "gl_version": {
+          "op": "<",
+          "value" : "3.5"
+        },
+        "features" : [
+          "test_feature_1"
+        ]
+      }
+  );
+  ScopedEntry entry(GetEntryFromString(json));
+  EXPECT_TRUE(entry.get() != NULL);
+
+  GPUInfo gpu_info;
+  EXPECT_TRUE(entry->NeedsMoreInfo(gpu_info, true));
+  EXPECT_TRUE(
+      entry->Contains(GpuControlList::kOsUnknown, std::string(), gpu_info));
+
+  gpu_info.gl_version = "3.1 Mesa 11.1.0";
+  EXPECT_FALSE(entry->NeedsMoreInfo(gpu_info, false));
+  EXPECT_TRUE(
+      entry->Contains(GpuControlList::kOsUnknown, std::string(), gpu_info));
+
+  gpu_info.gl_version = "4.1 Mesa 12.1.0";
+  EXPECT_FALSE(entry->NeedsMoreInfo(gpu_info, false));
+  EXPECT_FALSE(
+      entry->Contains(GpuControlList::kOsUnknown, std::string(), gpu_info));
+
+  gpu_info.gl_version = "OpenGL ES 2.0 Mesa 12.1.0";
+  EXPECT_FALSE(entry->NeedsMoreInfo(gpu_info, false));
+  EXPECT_FALSE(
+      entry->Contains(GpuControlList::kOsUnknown, std::string(), gpu_info));

[Zhenyao Mo, 2016/09/30 23:29:22]

Can you try a "OpenGL ES 3.6 Mesa 20.0.0"? Just wanna make sure GL and ES work
as intended.

[Zhenyao Mo, 2016/09/30 23:30:14]

Never mind.  Just realized it/s < 3.5 so this last case already covered it.

+}
+
 TEST_F(GpuControlListEntryTest, FeatureTypeAllEntry) {
   const std::string json = LONG_STRING_CONST(
       {
         "id": 1,
         "features": [
           "all"
         ]
       }
   );
   ScopedEntry entry(GetEntryFromString(json, true));
@@ skipping 504 matching lines @@
   EXPECT_TRUE(entry->Contains(GpuControlList::kOsLinux,
                               "3.13.0-63-generic",
                               gpu_info));
   EXPECT_FALSE(entry->Contains(GpuControlList::kOsLinux,
                                "3.19.2-1-generic",
                                gpu_info));
 }
 
 }  // namespace gpu