ShellTest -> ServiceTest

media/mojo/services/media_mojo_unittest.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 <stdint.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.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/mojo/clients/mojo_demuxer_stream_impl.h"
 #include "media/mojo/common/media_type_converters.h"
 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
 #include "media/mojo/interfaces/decryptor.mojom.h"
 #include "media/mojo/interfaces/renderer.mojom.h"
 #include "media/mojo/interfaces/service_factory.mojom.h"
-#include "services/shell/public/cpp/shell_test.h"
+#include "services/shell/public/cpp/service_test.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::Exactly;
 using testing::Invoke;
 using testing::InvokeWithoutArgs;
 using testing::StrictMock;
 
 namespace media {
 namespace {
 
@@ skipping 13 matching lines @@
   MOCK_METHOD1(OnBufferingStateChange, void(mojom::BufferingState state));
   MOCK_METHOD0(OnEnded, void());
   MOCK_METHOD0(OnError, void());
   MOCK_METHOD1(OnVideoOpacityChange, void(bool opaque));
   MOCK_METHOD1(OnVideoNaturalSizeChange, void(const gfx::Size& size));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockRendererClient);
 };
 
-class MediaShellTest : public shell::test::ShellTest {
+class MediaServiceTest : public shell::test::ServiceTest {
  public:
-  MediaShellTest()
-      : ShellTest("exe:media_mojo_unittests"),
+  MediaServiceTest()
+      : ServiceTest("exe:media_mojo_unittests"),
         renderer_client_binding_(&renderer_client_),
         video_stream_(DemuxerStream::VIDEO) {}
-  ~MediaShellTest() override {}
+  ~MediaServiceTest() override {}
 
   void SetUp() override {
-    ShellTest::SetUp();
+    ServiceTest::SetUp();
 
     connection_ = connector()->Connect("mojo:media");
-    connection_->SetConnectionLostClosure(
-        base::Bind(&MediaShellTest::ConnectionClosed, base::Unretained(this)));
+    connection_->SetConnectionLostClosure(base::Bind(
+        &MediaServiceTest::ConnectionClosed, base::Unretained(this)));
 
     connection_->GetInterface(&service_factory_);
 
     run_loop_.reset(new base::RunLoop());
   }
 
   // MOCK_METHOD* doesn't support move only types. Work around this by having
   // an extra method.
   MOCK_METHOD2(OnCdmInitializedInternal, void(bool result, int cdm_id));
   void OnCdmInitialized(mojom::CdmPromiseResultPtr result,
                         int cdm_id,
                         mojom::DecryptorPtr decryptor) {
     OnCdmInitializedInternal(result->success, cdm_id);
   }
 
   void InitializeCdm(const std::string& key_system,
                      bool expected_result,
                      int cdm_id) {
     service_factory_->CreateCdm(mojo::GetProxy(&cdm_));
 
     EXPECT_CALL(*this, OnCdmInitializedInternal(expected_result, cdm_id))
         .Times(Exactly(1))
         .WillOnce(InvokeWithoutArgs(run_loop_.get(), &base::RunLoop::Quit));
-    cdm_->Initialize(
-        key_system, kSecurityOrigin, mojom::CdmConfig::From(CdmConfig()),
-        base::Bind(&MediaShellTest::OnCdmInitialized, base::Unretained(this)));
+    cdm_->Initialize(key_system, kSecurityOrigin,
+                     mojom::CdmConfig::From(CdmConfig()),
+                     base::Bind(&MediaServiceTest::OnCdmInitialized,
+                                base::Unretained(this)));
   }
 
   MOCK_METHOD1(OnRendererInitialized, void(bool));
 
   void InitializeRenderer(const VideoDecoderConfig& video_config,
                           bool expected_result) {
     service_factory_->CreateRenderer(mojo::GetProxy(&renderer_));
 
     video_stream_.set_video_decoder_config(video_config);
 
     mojom::DemuxerStreamPtr video_stream_proxy;
     mojo_video_stream_.reset(new MojoDemuxerStreamImpl(
         &video_stream_, GetProxy(&video_stream_proxy)));
 
     EXPECT_CALL(*this, OnRendererInitialized(expected_result))
         .Times(Exactly(1))
         .WillOnce(InvokeWithoutArgs(run_loop_.get(), &base::RunLoop::Quit));
     renderer_->Initialize(renderer_client_binding_.CreateInterfacePtrAndBind(),
                           nullptr, std::move(video_stream_proxy),
-                          base::Bind(&MediaShellTest::OnRendererInitialized,
+                          base::Bind(&MediaServiceTest::OnRendererInitialized,
                                      base::Unretained(this)));
   }
 
   MOCK_METHOD0(ConnectionClosed, void());
 
  protected:
   std::unique_ptr<base::RunLoop> run_loop_;
 
   mojom::ServiceFactoryPtr service_factory_;
   mojom::ContentDecryptionModulePtr cdm_;
   mojom::RendererPtr renderer_;
 
   StrictMock<MockRendererClient> renderer_client_;
   mojo::Binding<mojom::RendererClient> renderer_client_binding_;
 
   StrictMock<MockDemuxerStream> video_stream_;
   std::unique_ptr<MojoDemuxerStreamImpl> mojo_video_stream_;
 
  private:
   std::unique_ptr<shell::Connection> connection_;
 
-  DISALLOW_COPY_AND_ASSIGN(MediaShellTest);
+  DISALLOW_COPY_AND_ASSIGN(MediaServiceTest);
 };
 
 }  // namespace
 
 // Note: base::RunLoop::RunUntilIdle() does not work well in these tests because
 // even when the loop is idle, we may still have pending events in the pipe.
 
 #if defined(ENABLE_MOJO_CDM)
-TEST_F(MediaShellTest, InitializeCdm_Success) {
+TEST_F(MediaServiceTest, InitializeCdm_Success) {
   InitializeCdm(kClearKeyKeySystem, true, 1);
   run_loop_->Run();
 }
 
-TEST_F(MediaShellTest, InitializeCdm_InvalidKeySystem) {
+TEST_F(MediaServiceTest, InitializeCdm_InvalidKeySystem) {
   InitializeCdm(kInvalidKeySystem, false, 0);
   run_loop_->Run();
 }
 #endif  // defined(ENABLE_MOJO_CDM)
 
 #if defined(ENABLE_MOJO_RENDERER)
 // Sometimes fails on Linux. http://crbug.com/594977
 #if defined(OS_LINUX)
 #define MAYBE_InitializeRenderer_Success DISABLED_InitializeRenderer_Success
 #else
 #define MAYBE_InitializeRenderer_Success InitializeRenderer_Success
 #endif
 
-TEST_F(MediaShellTest, MAYBE_InitializeRenderer_Success) {
+TEST_F(MediaServiceTest, MAYBE_InitializeRenderer_Success) {
   InitializeRenderer(TestVideoConfig::Normal(), true);
   run_loop_->Run();
 }
 
-TEST_F(MediaShellTest, InitializeRenderer_InvalidConfig) {
+TEST_F(MediaServiceTest, InitializeRenderer_InvalidConfig) {
   InitializeRenderer(TestVideoConfig::Invalid(), false);
   run_loop_->Run();
 }
 #endif  // defined(ENABLE_MOJO_RENDERER)
 
-TEST_F(MediaShellTest, Lifetime) {
+TEST_F(MediaServiceTest, Lifetime) {
   // Disconnecting CDM and Renderer services doesn't terminate the app.
   cdm_.reset();
   renderer_.reset();
 
   // Disconnecting ServiceFactory service should terminate the app, which will
   // close the connection.
   EXPECT_CALL(*this, ConnectionClosed())
       .Times(Exactly(1))
       .WillOnce(Invoke(run_loop_.get(), &base::RunLoop::Quit));
   service_factory_.reset();
 
   run_loop_->Run();
 }
 
 }  // namespace media