media: AVDA always reports SUPPORTS_DEFERRED_INITIALIZATION

media/gpu/android_video_decode_accelerator.cc

Index: media/gpu/android_video_decode_accelerator.cc
diff --git a/media/gpu/android_video_decode_accelerator.cc b/media/gpu/android_video_decode_accelerator.cc
index f6b7178318127a2e80e5f487788c70daad1e162d..cd3fa51f12b2f79aff88096e1b41d41674f203a2 100644
--- a/media/gpu/android_video_decode_accelerator.cc
+++ b/media/gpu/android_video_decode_accelerator.cc
@@ -1403,9 +1403,8 @@ AndroidVideoDecodeAccelerator::GetCapabilities(
   Capabilities capabilities;
   SupportedProfiles& profiles = capabilities.supported_profiles;
 
-  SupportedProfile profile;
-
   if (media::MediaCodecUtil::IsVp8DecoderAvailable()) {
+    SupportedProfile profile;
     profile.profile = media::VP8PROFILE_ANY;
     profile.min_resolution.SetSize(0, 0);
     profile.max_resolution.SetSize(1920, 1088);
@@ -1420,6 +1419,7 @@ AndroidVideoDecodeAccelerator::GetCapabilities(
   }
 
   if (media::MediaCodecUtil::IsVp9DecoderAvailable()) {
+    SupportedProfile profile;
     profile.min_resolution.SetSize(0, 0);
     profile.max_resolution.SetSize(1920, 1088);
     // If we know MediaCodec will just create a software codec, prefer our
@@ -1450,11 +1450,11 @@ AndroidVideoDecodeAccelerator::GetCapabilities(
     profiles.push_back(profile);
   }
 
+  capabilities.flags = media::VideoDecodeAccelerator::Capabilities::
+      SUPPORTS_DEFERRED_INITIALIZATION;
   if (UseDeferredRenderingStrategy(gpu_preferences)) {
-    capabilities.flags = media::VideoDecodeAccelerator::Capabilities::
-                             NEEDS_ALL_PICTURE_BUFFERS_TO_DECODE |
-                         media::VideoDecodeAccelerator::Capabilities::
-                             SUPPORTS_DEFERRED_INITIALIZATION;
+    capabilities.flags |= media::VideoDecodeAccelerator::Capabilities::
+        NEEDS_ALL_PICTURE_BUFFERS_TO_DECODE;
     if (media::MediaCodecUtil::IsSurfaceViewOutputSupported()) {
       capabilities.flags |= media::VideoDecodeAccelerator::Capabilities::
           SUPPORTS_EXTERNAL_OUTPUT_SURFACE;