Get rid of gpu related switches by passing gpu::GpuPreferences via IPC.

content/browser/android/synchronous_compositor_base.cc

 // Copyright 2015 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 "content/browser/android/synchronous_compositor_base.h"
 
 #include "base/command_line.h"
 #include "base/supports_user_data.h"
 #include "content/browser/android/in_process/synchronous_compositor_factory_impl.h"
 #include "content/browser/android/in_process/synchronous_compositor_impl.h"
 #include "content/browser/android/synchronous_compositor_host.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/web_contents/web_contents_android.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/gpu/in_process_gpu_thread.h"
 #include "content/public/common/content_switches.h"
 
 namespace content {
 
 class SynchronousCompositorClient;
 
 namespace {
 
 base::LazyInstance<scoped_refptr<gpu::InProcessCommandBuffer::Service>>
     g_gpu_service = LAZY_INSTANCE_INITIALIZER;
 
 base::Thread* CreateInProcessGpuThreadForSynchronousCompositor(
-    const InProcessChildThreadParams& params) {
+    const InProcessChildThreadParams& params,
+    const gpu::GpuPreferences& gpu_preferences) {
   DCHECK(g_gpu_service.Get());
-  return new InProcessGpuThread(params,
-                                g_gpu_service.Get()->gpu_preferences(),
+  return new InProcessGpuThread(params, gpu_preferences,
                                 g_gpu_service.Get()->sync_point_manager());
 }
 
 }  // namespace
 
 void SynchronousCompositor::SetGpuService(
     scoped_refptr<gpu::InProcessCommandBuffer::Service> service) {
   DCHECK(!g_gpu_service.Get());
   g_gpu_service.Get() = service;
   GpuProcessHost::RegisterGpuMainThreadFactory(
@@ skipping 28 matching lines @@
         command_line->HasSwitch(switches::kSingleProcess);
     return make_scoped_ptr(new SynchronousCompositorHost(
         rwhva, web_contents_android->synchronous_compositor_client(),
         use_in_proc_software_draw));
   }
   return make_scoped_ptr(new SynchronousCompositorImpl(
       rwhva, web_contents_android->synchronous_compositor_client()));
 }
 
 }  // namespace content