Support multiple video decoders and encoders

content/common/gpu/media/gpu_video_encode_accelerator.h

Index: content/common/gpu/media/gpu_video_encode_accelerator.h
diff --git a/content/common/gpu/media/gpu_video_encode_accelerator.h b/content/common/gpu/media/gpu_video_encode_accelerator.h
index ca60f6f1c8dcac639a5424a3bc66867e3acf4666..00c749cf99c1cceb5e2ecaf3d5c451ce18a1e235 100644
--- a/content/common/gpu/media/gpu_video_encode_accelerator.h
+++ b/content/common/gpu/media/gpu_video_encode_accelerator.h
@@ -60,14 +60,16 @@ class GpuVideoEncodeAccelerator
   // Static query for supported profiles.  This query calls the appropriate
   // platform-specific version.
   static std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>
-  GetSupportedProfiles();
+      GetSupportedProfiles();
   static std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>
-  ConvertMediaToGpuProfiles(const std::vector<
-      media::VideoEncodeAccelerator::SupportedProfile>& media_profiles);
+      ConvertMediaToGpuProfiles(const std::vector<
+          media::VideoEncodeAccelerator::SupportedProfile>& media_profiles);
 
  private:
-  // Create the appropriate platform-specific VEA.
-  static scoped_ptr<media::VideoEncodeAccelerator> CreateEncoder();
+  // Create the appropriate platform-specific VEA except vaapi VEA.
+  static scoped_ptr<media::VideoEncodeAccelerator> CreateDefaultEncoder();
+  // Create vaapi VEA on x86 CrOS.
+  static scoped_ptr<media::VideoEncodeAccelerator> CreateVaapiEncoder();
 
   // IPC handlers, proxying media::VideoEncodeAccelerator for the renderer
   // process.