media: Mojo interfaces renaming.

media/mojo/services/media_apptest.cc

 // Copyright 2015 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 "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "media/base/cdm_config.h"
 #include "media/base/mock_filters.h"
 #include "media/base/test_helpers.h"
 #include "media/cdm/key_system_names.h"
 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
-#include "media/mojo/interfaces/media_renderer.mojom.h"
+#include "media/mojo/interfaces/renderer.mojom.h"
 #include "media/mojo/interfaces/service_factory.mojom.h"
 #include "media/mojo/services/media_type_converters.h"
 #include "media/mojo/services/mojo_demuxer_stream_impl.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/application_test_base.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::Exactly;
 using testing::Invoke;
 using testing::InvokeWithoutArgs;
 using testing::StrictMock;
 
 namespace media {
 namespace {
 
 const char kInvalidKeySystem[] = "invalid.key.system";
 const char kSecurityOrigin[] = "http://foo.com";
 
-class MockMediaRendererClient : public interfaces::MediaRendererClient {
+class MockRendererClient : public interfaces::RendererClient {
  public:
-  MockMediaRendererClient(){};
-  ~MockMediaRendererClient() override{};
+  MockRendererClient(){};
+  ~MockRendererClient() override{};
 
-  // interfaces::MediaRendererClient implementation.
+  // interfaces::RendererClient implementation.
   MOCK_METHOD2(OnTimeUpdate, void(int64_t time_usec, int64_t max_time_usec));
   MOCK_METHOD1(OnBufferingStateChange, void(interfaces::BufferingState state));
   MOCK_METHOD0(OnEnded, void());
   MOCK_METHOD0(OnError, void());
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(MockMediaRendererClient);
+  DISALLOW_COPY_AND_ASSIGN(MockRendererClient);
 };
 
 class MediaAppTest : public mojo::test::ApplicationTestBase {
  public:
   MediaAppTest()
-      : media_renderer_client_binding_(&media_renderer_client_),
+      : renderer_client_binding_(&renderer_client_),
         video_demuxer_stream_(DemuxerStream::VIDEO) {}
   ~MediaAppTest() override {}
 
   void SetUp() override {
     ApplicationTestBase::SetUp();
 
     mojo::URLRequestPtr request = mojo::URLRequest::New();
     request->url = "mojo:media";
     mojo::ApplicationConnection* connection =
         application_impl()->ConnectToApplication(request.Pass());
 
     connection->ConnectToService(&service_factory_);
     service_factory_->CreateCdm(mojo::GetProxy(&cdm_));
-    service_factory_->CreateRenderer(mojo::GetProxy(&media_renderer_));
+    service_factory_->CreateRenderer(mojo::GetProxy(&renderer_));
 
     run_loop_.reset(new base::RunLoop());
   }
 
   // MOCK_METHOD* doesn't support move only types. Work around this by having
   // an extra method.
   MOCK_METHOD1(OnCdmInitializedInternal, void(bool result));
   void OnCdmInitialized(interfaces::CdmPromiseResultPtr result) {
     OnCdmInitializedInternal(result->success);
   }
 
   void InitializeCdm(const std::string& key_system, bool expected_result) {
     EXPECT_CALL(*this, OnCdmInitializedInternal(expected_result))
         .Times(Exactly(1))
         .WillOnce(InvokeWithoutArgs(run_loop_.get(), &base::RunLoop::Quit));
     cdm_->Initialize(
         key_system, kSecurityOrigin, interfaces::CdmConfig::From(CdmConfig()),
         1, base::Bind(&MediaAppTest::OnCdmInitialized, base::Unretained(this)));
   }
 
   MOCK_METHOD1(OnRendererInitialized, void(bool));
 
   void InitializeRenderer(const VideoDecoderConfig& video_config,
                           bool expected_result) {
     video_demuxer_stream_.set_video_decoder_config(video_config);
 
     interfaces::DemuxerStreamPtr video_stream;
     new MojoDemuxerStreamImpl(&video_demuxer_stream_, GetProxy(&video_stream));
 
-    interfaces::MediaRendererClientPtr client_ptr;
-    media_renderer_client_binding_.Bind(GetProxy(&client_ptr));
+    interfaces::RendererClientPtr client_ptr;
+    renderer_client_binding_.Bind(GetProxy(&client_ptr));
 
     EXPECT_CALL(*this, OnRendererInitialized(expected_result))
         .Times(Exactly(1))
         .WillOnce(InvokeWithoutArgs(run_loop_.get(), &base::RunLoop::Quit));
-    media_renderer_->Initialize(client_ptr.Pass(), nullptr, video_stream.Pass(),
-                                base::Bind(&MediaAppTest::OnRendererInitialized,
-                                           base::Unretained(this)));
+    renderer_->Initialize(client_ptr.Pass(), nullptr, video_stream.Pass(),
+                          base::Bind(&MediaAppTest::OnRendererInitialized,
+                                     base::Unretained(this)));
   }
 
  protected:
   scoped_ptr<base::RunLoop> run_loop_;
 
   interfaces::ServiceFactoryPtr service_factory_;
   interfaces::ContentDecryptionModulePtr cdm_;
-  interfaces::MediaRendererPtr media_renderer_;
+  interfaces::RendererPtr renderer_;
 
-  StrictMock<MockMediaRendererClient> media_renderer_client_;
-  mojo::Binding<interfaces::MediaRendererClient> media_renderer_client_binding_;
+  StrictMock<MockRendererClient> renderer_client_;
+  mojo::Binding<interfaces::RendererClient> renderer_client_binding_;
 
   StrictMock<MockDemuxerStream> video_demuxer_stream_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaAppTest);
 };
 
 }  // namespace
 
 // Note: base::RunLoop::RunUntilIdle() does not work well in these tests because
@@ skipping 13 matching lines @@
   InitializeRenderer(TestVideoConfig::Normal(), true);
   run_loop_->Run();
 }
 
 TEST_F(MediaAppTest, InitializeRenderer_InvalidConfig) {
   InitializeRenderer(TestVideoConfig::Invalid(), false);
   run_loop_->Run();
 }
 
 }  // namespace media