Revert "Make V4L2VEA GetSupportedProfiles static."

This reverts commit 8396651c.

ChromeOS has moved driver initialization earlier before Chrome
starts.

BUG=425412
TEST=Reboot on peach pit, run apprtc loopback, and check histograms.

Review URL: https://codereview.chromium.org/651833005

Cr-Commit-Position: refs/heads/master@{#300718}

content/common/gpu/media/gpu_video_encode_accelerator.cc

@@ -165,12 +165,6 @@ void GpuVideoEncodeAccelerator::OnWillDestroyStub() {
 // static
 std::vector<media::VideoEncodeAccelerator::SupportedProfile>
 GpuVideoEncodeAccelerator::GetSupportedProfiles() {
-#if defined(OS_CHROMEOS) && defined(USE_X11) && defined(ARCH_CPU_ARMEL)
-  // This is a work-around for M39 because the video device is not ready at
-  // boot.
-  // TODO(wuchengli): remove this after http://crbug.com/418762 is fixed.
-  return V4L2VideoEncodeAccelerator::GetSupportedProfilesStatic();
-#endif
   scoped_ptr<media::VideoEncodeAccelerator> encoder = CreateEncoder();
   if (!encoder)
     return std::vector<media::VideoEncodeAccelerator::SupportedProfile>();

content/common/gpu/media/v4l2_video_encode_accelerator.cc

@@ -282,11 +282,6 @@ void V4L2VideoEncodeAccelerator::Destroy() {
 
 std::vector<media::VideoEncodeAccelerator::SupportedProfile>
 V4L2VideoEncodeAccelerator::GetSupportedProfiles() {
-  return GetSupportedProfilesStatic();
-}
-
-std::vector<media::VideoEncodeAccelerator::SupportedProfile>
-V4L2VideoEncodeAccelerator::GetSupportedProfilesStatic() {
   std::vector<SupportedProfile> profiles;
   SupportedProfile profile;
 

content/common/gpu/media/v4l2_video_encode_accelerator.h

@@ -45,9 +45,6 @@ class CONTENT_EXPORT V4L2VideoEncodeAccelerator
   explicit V4L2VideoEncodeAccelerator(scoped_ptr<V4L2Device> device);
   virtual ~V4L2VideoEncodeAccelerator();
 
-  static std::vector<media::VideoEncodeAccelerator::SupportedProfile>
-      GetSupportedProfilesStatic();
-
   // media::VideoEncodeAccelerator implementation.
   virtual std::vector<media::VideoEncodeAccelerator::SupportedProfile>
       GetSupportedProfiles() override;