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

gpu/config/gpu_util.cc

 // Copyright (c) 2012 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 <vector>
 
 #include "base/command_line.h"
@@ skipping 43 matching lines @@
            str, ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
     uint32_t id = 0;
     bool succeed = base::HexStringToUInt(piece, &id);
     DCHECK(succeed);
     list->push_back(id);
   }
 }
 
 }  // namespace anonymous
 
-void MergeFeatureSets(std::set<int>* dst, const std::set<int>& src) {
-  DCHECK(dst);
-  if (src.empty())
-    return;
-  dst->insert(src.begin(), src.end());
-}
-
 void ApplyGpuDriverBugWorkarounds(const GPUInfo& gpu_info,
                                   base::CommandLine* command_line) {
   std::unique_ptr<GpuDriverBugList> list(GpuDriverBugList::Create());
   list->LoadList(kGpuDriverBugListJson,
                  GpuControlList::kCurrentOsOnly);
   std::set<int> workarounds = list->MakeDecision(
       GpuControlList::kOsAny, std::string(), gpu_info);
   GpuDriverBugList::AppendWorkaroundsFromCommandLine(
       &workarounds, *command_line);
   if (!workarounds.empty()) {
@@ skipping 71 matching lines @@
       ui::GpuSwitchingManager::GetInstance();
   if (!switching_manager->SupportsDualGpus())
     return;
   if (driver_bug_workarounds.count(gpu::FORCE_DISCRETE_GPU) == 1)
     ui::GpuSwitchingManager::GetInstance()->ForceUseOfDiscreteGpu();
   else if (driver_bug_workarounds.count(gpu::FORCE_INTEGRATED_GPU) == 1)
     ui::GpuSwitchingManager::GetInstance()->ForceUseOfIntegratedGpu();
 }
 
 }  // namespace gpu