media: Rename ServiceFactory to InterfaceFactory

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/interface_factory.mojom.h"
 #include "media/mojo/interfaces/renderer.mojom.h"
-#include "media/mojo/interfaces/service_factory.mojom.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "services/service_manager/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 {
@@ skipping 37 matching lines @@
         video_stream_(DemuxerStream::VIDEO) {}
   ~MediaServiceTest() override {}
 
   void SetUp() override {
     ServiceTest::SetUp();
 
     connection_ = connector()->Connect("service:media");
     connection_->SetConnectionLostClosure(base::Bind(
         &MediaServiceTest::ConnectionClosed, base::Unretained(this)));
 
-    connection_->GetInterface(&service_factory_);
+    connection_->GetInterface(&interface_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_));
+    interface_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(&MediaServiceTest::OnCdmInitialized,
                                 base::Unretained(this)));
   }
 
   MOCK_METHOD1(OnRendererInitialized, void(bool));
 
   void InitializeRenderer(const VideoDecoderConfig& video_config,
                           bool expected_result) {
-    service_factory_->CreateRenderer(std::string(), mojo::GetProxy(&renderer_));
+    interface_factory_->CreateRenderer(std::string(),
+                                       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)));
 
     mojom::RendererClientAssociatedPtrInfo client_ptr_info;
     renderer_client_binding_.Bind(&client_ptr_info,
                                   renderer_.associated_group());
 
     EXPECT_CALL(*this, OnRendererInitialized(expected_result))
         .Times(Exactly(1))
         .WillOnce(InvokeWithoutArgs(run_loop_.get(), &base::RunLoop::Quit));
     renderer_->Initialize(std::move(client_ptr_info), nullptr,
                           std::move(video_stream_proxy), base::nullopt,
                           base::Bind(&MediaServiceTest::OnRendererInitialized,
                                      base::Unretained(this)));
   }
 
   MOCK_METHOD0(ConnectionClosed, void());
 
  protected:
   std::unique_ptr<base::RunLoop> run_loop_;
 
-  mojom::ServiceFactoryPtr service_factory_;
+  mojom::InterfaceFactoryPtr interface_factory_;
   mojom::ContentDecryptionModulePtr cdm_;
   mojom::RendererPtr renderer_;
 
   StrictMock<MockRendererClient> renderer_client_;
   mojo::AssociatedBinding<mojom::RendererClient> renderer_client_binding_;
 
   StrictMock<MockDemuxerStream> video_stream_;
   std::unique_ptr<MojoDemuxerStreamImpl> mojo_video_stream_;
 
  private:
@@ skipping 36 matching lines @@
   InitializeRenderer(TestVideoConfig::Invalid(), false);
   run_loop_->Run();
 }
 #endif  // defined(ENABLE_MOJO_RENDERER)
 
 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
+  // Disconnecting InterfaceFactory 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();
+  interface_factory_.reset();
 
   run_loop_->Run();
 }
 
 }  // namespace media