Send enter / exit fullscreen signal to AVDA

media/gpu/android_video_decode_accelerator_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/gpu/android_video_decode_accelerator.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 319 matching lines @@
     vda_.reset(avda);
 
     bool result = vda_->Initialize(config_, &client_);
     base::RunLoop().RunUntilIdle();
     return result;
   }
 
   // Initialize |vda_|, providing a new surface for it.  You may get the surface
   // by asking |codec_allocator_|.
   void InitializeAVDAWithOverlay() {
-    config_.surface_id = 123;
+    config_.overlay_info.surface_id = 123;
     ASSERT_TRUE(InitializeAVDA());
     base::RunLoop().RunUntilIdle();
     ASSERT_TRUE(chooser_->factory_);
 
     // Have the factory provide an overlay, and verify that codec creation is
     // provided with that overlay.
     std::unique_ptr<MockAndroidOverlay> overlay =
         base::MakeUnique<MockAndroidOverlay>();
     overlay_callbacks_ = overlay->GetCallbacks();
 
@@ skipping 129 matching lines @@
        LowEndDevicesSucceedInitWithoutASurface) {
   // If AVDA decides that we should defer surface creation, then it should
   // signal success before we provide a surface.  It should still ask for a
   // surface, though.
   SKIP_IF_MEDIACODEC_IS_NOT_AVAILABLE();
 
   // It would be nicer if we didn't just force this on, since we might do so
   // in a state that AVDA isn't supposed to handle (e.g., if we give it a
   // surface, then it would never decide to defer surface creation).
   platform_config_.force_deferred_surface_creation = true;
-  config_.surface_id = SurfaceManager::kNoSurfaceID;
+  config_.overlay_info.surface_id = SurfaceManager::kNoSurfaceID;
 
   EXPECT_CALL(*chooser_, MockInitialize()).Times(0);
   EXPECT_CALL(client_, NotifyInitializationComplete(true));
 
   InitializeAVDA();
 }
 
 TEST_F(AndroidVideoDecodeAcceleratorTest,
        AsyncInitWithSurfaceTextureAndDelete) {
   // When configuring with a SurfaceTexture and deferred init, we should be
@@ skipping 184 matching lines @@
 
   InitializeAVDAWithSurfaceTexture();
 
   // This should do nothing.
   EXPECT_CALL(*codec_allocator_.most_recent_codec(), SetSurface(_)).Times(0);
   chooser_->ProvideSurfaceTexture();
 
   base::RunLoop().RunUntilIdle();
 }
 
+TEST_F(AndroidVideoDecodeAcceleratorTest,
+       OverlayInfoWithoutFactoryInfoDoesntChangeTheSurface) {
+  // Send OverlayInfo without surface id / routing token, and verify that AVDA
+  // doesn't try to change the factory.
+  InitializeAVDAWithOverlay();
+
+  EXPECT_CALL(*chooser_, MockReplaceOverlayFactory()).Times(0);
+  avda()->SetOverlayInfo(OverlayInfo());
+}
+
 }  // namespace media