Add multiple destruction callbacks to AndroidOverlay.

media/mojo/clients/mojo_android_overlay_unittest.cc

 // Copyright 2017 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 <memory>
 
 #include "base/android/jni_android.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 62 matching lines @@
 
   ~MojoAndroidOverlayTest() override {}
 
   void SetUp() override {
     // Set up default config.
     config_.rect = gfx::Rect(100, 200, 300, 400);
     config_.ready_cb = base::Bind(&MockClientCallbacks::OnReady,
                                   base::Unretained(&callbacks_));
     config_.failed_cb = base::Bind(&MockClientCallbacks::OnFailed,
                                    base::Unretained(&callbacks_));
-    config_.destroyed_cb = base::Bind(&MockClientCallbacks::OnDestroyed,
-                                      base::Unretained(&callbacks_));
 
     // Make sure that we have an implementation of GpuSurfaceLookup.
     gpu::GpuSurfaceTracker::Get();
   }
 
   void TearDown() override {
     overlay_client_.reset();
 
     // If we registered a surface, then unregister it.
     if (surface_texture_) {
       gpu::GpuSurfaceTracker::Get()->RemoveSurface(surface_key_);
       // Drop the surface before the surface texture.
       surface_ = gl::ScopedJavaSurface();
     }
 
     base::RunLoop().RunUntilIdle();
   }
 
   // Create an overlay in |overlay_client_| using the current config, but do
   // not bind anything to |overlay_request_| yet.
   void CreateOverlay() {
     EXPECT_CALL(mock_provider_, OverlayCreated());
 
     base::UnguessableToken routing_token = base::UnguessableToken::Create();
     mojom::AndroidOverlayProviderPtr provider_ptr;
     provider_binding_.Bind(mojo::MakeRequest(&provider_ptr));
 
     overlay_client_.reset(new MojoAndroidOverlay(
         std::move(provider_ptr), std::move(config_), routing_token));
+    overlay_client_->AddDestructionCallback(base::Bind(
+        &MockClientCallbacks::OnDestroyed, base::Unretained(&callbacks_)));
     base::RunLoop().RunUntilIdle();
   }
 
   // Create an overlay, then provide it with |mock_overlay_|.
   void CreateAndInitializeOverlay() {
     CreateOverlay();
 
     // Bind an overlay to the request.
     overlay_binding_.Bind(std::move(mock_provider_.overlay_request_));
     base::RunLoop().RunUntilIdle();
@@ skipping 106 matching lines @@
 }
 
 // Test |secure| makes it to the mojo config when it is false
 TEST_F(MojoAndroidOverlayTest, SecureFlagIsSentViaMojoWhenFalse) {
   config_.secure = false;
   CreateOverlay();
   ASSERT_FALSE(mock_provider_.config_->secure);
 }
 
 }  // namespace media