gpu: Unify code to initialize dual-gpu mode.

content/gpu/gpu_main.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 <stddef.h>
 #include <stdlib.h>
 
 #include <memory>
 #include <utility>
 
@@ skipping 12 matching lines @@
 #include "content/child/child_process.h"
 #include "content/common/content_constants_internal.h"
 #include "content/common/gpu_host_messages.h"
 #include "content/common/sandbox_linux/sandbox_linux.h"
 #include "content/gpu/gpu_child_thread.h"
 #include "content/gpu/gpu_process.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
+#include "gpu/config/gpu_driver_bug_list.h"
 #include "gpu/config/gpu_info_collector.h"
 #include "gpu/config/gpu_switches.h"
 #include "gpu/config/gpu_util.h"
 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
 #include "gpu/ipc/service/gpu_config.h"
 #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
 #include "gpu/ipc/service/gpu_watchdog_thread.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
@@ skipping 109 matching lines @@
       switches::kWindowDepth));
   DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kX11VisualID));
 #endif
 
 #endif
 
   logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
 
   if (command_line.HasSwitch(switches::kSupportsDualGpus)) {
-    std::string types = command_line.GetSwitchValueASCII(
-        switches::kGpuDriverBugWorkarounds);
     std::set<int> workarounds;
-    gpu::StringToFeatureSet(types, &workarounds);
-    if (workarounds.count(gpu::FORCE_DISCRETE_GPU) == 1)
-      ui::GpuSwitchingManager::GetInstance()->ForceUseOfDiscreteGpu();
-    else if (workarounds.count(gpu::FORCE_INTEGRATED_GPU) == 1)
-      ui::GpuSwitchingManager::GetInstance()->ForceUseOfIntegratedGpu();
+    gpu::GpuDriverBugList::AppendWorkaroundsFromCommandLine(&workarounds,
+                                                            command_line);
+    gpu::InitializeDualGpusIfSupported(workarounds);
   }
 
   // Initialization of the OpenGL bindings may fail, in which case we
   // will need to tear down this process. However, we can not do so
   // safely until the IPC channel is set up, because the detection of
   // early return of a child process is implemented using an IPC
   // channel error. If the IPC channel is not fully set up between the
   // browser and GPU process, and the GPU process crashes or exits
   // early, the browser process will never detect it.  For this reason
   // we defer tearing down the GPU process until receiving the
@@ skipping 367 matching lines @@
     return true;
   }
 
   return false;
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace.
 
 }  // namespace content