Don't forbid GPU process if WebGL/WebGL2 is disabled on GPU but not browser.

gpu/config/gpu_util_unittest.cc

Index: gpu/config/gpu_util_unittest.cc
diff --git a/gpu/config/gpu_util_unittest.cc b/gpu/config/gpu_util_unittest.cc
index da52c18a2797c2ba960353688c5bf6ae0b7093f8..4b28ac649d197ebbbd3e9d5dee0f5b39fc770d8e 100644
--- a/gpu/config/gpu_util_unittest.cc
+++ b/gpu/config/gpu_util_unittest.cc
@@ -18,46 +18,6 @@
 
 namespace gpu {
 
-TEST(GpuUtilTest, MergeFeatureSets) {
-  {
-    // Merge two empty sets.
-    std::set<int> src;
-    std::set<int> dst;
-    EXPECT_TRUE(dst.empty());
-    MergeFeatureSets(&dst, src);
-    EXPECT_TRUE(dst.empty());
-  }
-  {
-    // Merge an empty set into a set with elements.
-    std::set<int> src;
-    std::set<int> dst;
-    dst.insert(1);
-    EXPECT_EQ(1u, dst.size());
-    MergeFeatureSets(&dst, src);
-    EXPECT_EQ(1u, dst.size());
-  }
-  {
-    // Merge two sets where the source elements are already in the target set.
-    std::set<int> src;
-    std::set<int> dst;
-    src.insert(1);
-    dst.insert(1);
-    EXPECT_EQ(1u, dst.size());
-    MergeFeatureSets(&dst, src);
-    EXPECT_EQ(1u, dst.size());
-  }
-  {
-    // Merge two sets with different elements.
-    std::set<int> src;
-    std::set<int> dst;
-    src.insert(1);
-    dst.insert(2);
-    EXPECT_EQ(1u, dst.size());
-    MergeFeatureSets(&dst, src);
-    EXPECT_EQ(2u, dst.size());
-  }
-}

[Ken Russell (switch to Gerrit), 2016/11/15 01:25:15]

Does your new test provide all the coverage you feel necessary for the removal
of this test?

[Zhenyao Mo, 2016/11/15 01:38:21]

The MergeFeatrure function is removed so there is no need for unittests.

-
 TEST(GpuUtilTest, StringToFeatureSet) {
   {
     // zero feature.