content gpu refactor: get rid of gpu related content switches.

content/gpu/gpu_child_thread.cc

Index: content/gpu/gpu_child_thread.cc
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
index 2452579e0a911404e22e98368b246de4513f409d..85ba324da8b714f8a403af9e1094b24ac7902f5e 100644
--- a/content/gpu/gpu_child_thread.cc
+++ b/content/gpu/gpu_child_thread.cc
@@ -17,7 +17,9 @@
 #include "content/common/gpu/establish_channel_params.h"
 #include "content/common/gpu/gpu_host_messages.h"
 #include "content/common/gpu/gpu_memory_buffer_factory.h"
+#include "content/common/gpu/media/gpu_jpeg_decode_accelerator.h"
 #include "content/common/gpu/media/gpu_video_decode_accelerator.h"
+#include "content/common/gpu/media/gpu_video_encode_accelerator.h"
 #include "content/common/gpu/media/media_service.h"
 #include "content/gpu/gpu_process_control_impl.h"
 #include "content/gpu/gpu_watchdog_thread.h"
@@ -189,10 +191,11 @@ GpuChildThread::GpuChildThread(
          base::CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kInProcessGPU));
 
-  // Populate accelerator capabilities (normally done during GpuMain, which is
-  // not called for single process or in process gpu).
+  // Populate accelerator capabilities (normally done during
+  // GpuChildThread::OnInitialize, which is not called for single process or in
+  // process gpu).

[piman, 2016/03/11 20:43:56]

Actually, GpuChildThread::OnInitialize is called, so I think you can remove this
code.

[Peng, 2016/03/11 22:43:16]

Done.

   gpu_info_.video_decode_accelerator_capabilities =
-      content::GpuVideoDecodeAccelerator::GetCapabilities();
+      content::GpuVideoDecodeAccelerator::GetCapabilities(gpu_preferences_);
 
 #if defined(ENABLE_VULKAN)
   // Temporary Vulkan initialization injection.
@@ -349,6 +352,15 @@ void GpuChildThread::StoreShaderToDisk(int32_t client_id,
 
 void GpuChildThread::OnInitialize(const gpu::GpuPreferences& gpu_preferences) {
   gpu_preferences_ = gpu_preferences;
+
+  gpu_info_.video_decode_accelerator_capabilities =
+      content::GpuVideoDecodeAccelerator::GetCapabilities(gpu_preferences_);
+  gpu_info_.video_encode_accelerator_supported_profiles =
+      content::GpuVideoEncodeAccelerator::GetSupportedProfiles(
+          gpu_preferences_);
+  gpu_info_.jpeg_decode_accelerator_supported =
+      content::GpuJpegDecodeAccelerator::IsSupported();
+
   // Record initialization only after collecting the GPU info because that can
   // take a significant amount of time.
   gpu_info_.initialization_time = base::Time::Now() - process_start_time_;