Don't require VDAs to return all PictureBuffers at once.

content/common/gpu/media/gpu_video_decode_accelerator.cc

Index: content/common/gpu/media/gpu_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc
index ed4d1799a300409632e35d1f38635e63c6c06be2..6960e512c8d253b512ca0e4ad5dcd74ff74e09aa 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc
@@ -46,8 +46,6 @@
 #elif defined(USE_OZONE)
 #include "media/ozone/media_ozone_platform.h"
 #elif defined(OS_ANDROID)
-#include "content/common/gpu/media/android_copying_backing_strategy.h"
-#include "content/common/gpu/media/android_deferred_rendering_backing_strategy.h"
 #include "content/common/gpu/media/android_video_decode_accelerator.h"
 #endif
 
@@ -152,12 +150,14 @@ GpuVideoDecodeAccelerator::~GpuVideoDecodeAccelerator() {
 }
 
 // static
-gpu::VideoDecodeAcceleratorSupportedProfiles
-GpuVideoDecodeAccelerator::GetSupportedProfiles() {
-  media::VideoDecodeAccelerator::SupportedProfiles profiles;
+gpu::VideoDecodeAcceleratorCapabilities
+GpuVideoDecodeAccelerator::GetCapabilities() {
+  media::VideoDecodeAccelerator::Capabilities capabilities;
+  media::VideoDecodeAccelerator::SupportedProfiles& profiles =
+      capabilities.supported_profiles;
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode))
-    return gpu::VideoDecodeAcceleratorSupportedProfiles();
+    return gpu::VideoDecodeAcceleratorCapabilities();
 
   // Query supported profiles for each VDA. The order of querying VDAs should
   // be the same as the order of initializing VDAs. Then the returned profile
@@ -179,9 +179,10 @@ GpuVideoDecodeAccelerator::GetSupportedProfiles() {
 #elif defined(OS_MACOSX)
   profiles = VTVideoDecodeAccelerator::GetSupportedProfiles();
 #elif defined(OS_ANDROID)
-  profiles = AndroidVideoDecodeAccelerator::GetSupportedProfiles();
+  capabilities = AndroidVideoDecodeAccelerator::GetCapabilities();
 #endif
-  return GpuVideoAcceleratorUtil::ConvertMediaToGpuDecodeProfiles(profiles);
+  return GpuVideoAcceleratorUtil::ConvertMediaToGpuDecodeCapabilities(
+      capabilities);
 }
 
 bool GpuVideoDecodeAccelerator::OnMessageReceived(const IPC::Message& msg) {
@@ -472,15 +473,8 @@ scoped_ptr<media::VideoDecodeAccelerator>
 GpuVideoDecodeAccelerator::CreateAndroidVDA() {
   scoped_ptr<media::VideoDecodeAccelerator> decoder;
 #if defined(OS_ANDROID)
-  decoder.reset(new AndroidVideoDecodeAccelerator(
-      stub_->decoder()->AsWeakPtr(), make_context_current_,
-      make_scoped_ptr(
-#if defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
-          new AndroidDeferredRenderingBackingStrategy()
-#else
-          new AndroidCopyingBackingStrategy()
-#endif
-              )));
+  decoder.reset(new AndroidVideoDecodeAccelerator(stub_->decoder()->AsWeakPtr(),
+                                                  make_context_current_));
 #endif
   return decoder.Pass();
 }