Integrate Surface requests with MediaPlayerRenderer

media/mojo/clients/mojo_renderer_unittest.cc

 // Copyright 2016 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 <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/test/test_message_loop.h"
@@ skipping 44 matching lines @@
 }  // namespace
 
 class MojoRendererTest : public ::testing::Test {
  public:
   MojoRendererTest() {
     std::unique_ptr<StrictMock<MockRenderer>> mock_renderer(
         new StrictMock<MockRenderer>());
     mock_renderer_ = mock_renderer.get();
 
     mojom::RendererPtr remote_renderer;
-    renderer_binding_ =
-        mojo::MakeStrongBinding(base::MakeUnique<MojoRendererService>(
-                                    mojo_cdm_service_context_.GetWeakPtr(),
-                                    nullptr, nullptr, std::move(mock_renderer)),
-                                mojo::GetProxy(&remote_renderer));
+    renderer_binding_ = MojoRendererService::Create(
+        mojo_cdm_service_context_.GetWeakPtr(), nullptr, nullptr,
+        std::move(mock_renderer),
+        MojoRendererService::InitiateSurfaceRequestCB(),
+        mojo::GetProxy(&remote_renderer));
 
     mojo_renderer_.reset(
         new MojoRenderer(message_loop_.task_runner(),
                          std::unique_ptr<VideoOverlayFactory>(nullptr), nullptr,
                          std::move(remote_renderer)));
 
     // CreateAudioStream() and CreateVideoStream() overrides expectations for
     // expected non-NULL streams.
     EXPECT_CALL(demuxer_, GetStream(_)).WillRepeatedly(Return(nullptr));
 
@@ skipping 345 matching lines @@
   Play();
   remote_renderer_client_->OnError(PIPELINE_ERROR_DECODE);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_CALL(*mock_renderer_, SetPlaybackRate(0.0)).Times(1);
   mojo_renderer_->SetPlaybackRate(0.0);
   Flush();
 }
 
 }  // namespace media