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

gpu/config/gpu_util_unittest.cc

 // Copyright (c) 2011 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 "gpu/config/gpu_util.h"
 
 #include <memory>
 
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "gpu/config/gpu_control_list_jsons.h"
 #include "gpu/config/gpu_driver_bug_list.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/config/gpu_info_collector.h"
 #include "gpu/config/gpu_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_switches.h"
 
 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.
     std::set<int> features;
     StringToFeatureSet("", &features);
     EXPECT_EQ(0u, features.size());
   }
   {
     // One features.
     std::set<int> features;
@@ skipping 132 matching lines @@
   EXPECT_EQ(gpu_info.secondary_gpus.size(), 2ul);
 
   command_line.AppendSwitchASCII(switches::kGpuTestingSecondaryVendorIDs, "");
   command_line.AppendSwitchASCII(switches::kGpuTestingSecondaryDeviceIDs, "");
 
   ParseSecondaryGpuDevicesFromCommandLine(command_line, &gpu_info);
   EXPECT_EQ(gpu_info.secondary_gpus.size(), 0ul);
 }
 
 }  // namespace gpu