Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(427)

Side by Side Diff: media/mojo/services/media_apptest.cc

Issue 1249643004: media: Quit MojoMediaApplication when no ServiceFactory service is bound. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/callback.h" 6 #include "base/callback.h"
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "media/base/cdm_config.h" 10 #include "media/base/cdm_config.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 : media_renderer_client_binding_(&media_renderer_client_), 53 : media_renderer_client_binding_(&media_renderer_client_),
54 video_demuxer_stream_(DemuxerStream::VIDEO) {} 54 video_demuxer_stream_(DemuxerStream::VIDEO) {}
55 ~MediaAppTest() override {} 55 ~MediaAppTest() override {}
56 56
57 void SetUp() override { 57 void SetUp() override {
58 ApplicationTestBase::SetUp(); 58 ApplicationTestBase::SetUp();
59 59
60 mojo::URLRequestPtr request = mojo::URLRequest::New(); 60 mojo::URLRequestPtr request = mojo::URLRequest::New();
61 request->url = "mojo:media"; 61 request->url = "mojo:media";
62 mojo::ApplicationConnection* connection = 62 mojo::ApplicationConnection* connection =
63 application_impl()->ConnectToApplication(request.Pass()); 63 application_impl()->ConnectToApplication(
64 request.Pass(),
65 base::Bind(&MediaAppTest::OnAppTerminated, base::Unretained(this)));
64 66
65 connection->ConnectToService(&service_factory_); 67 connection->ConnectToService(&service_factory_);
66 service_factory_->CreateCdm(mojo::GetProxy(&cdm_)); 68 service_factory_->CreateCdm(mojo::GetProxy(&cdm_));
67 service_factory_->CreateRenderer(mojo::GetProxy(&media_renderer_)); 69 service_factory_->CreateRenderer(mojo::GetProxy(&media_renderer_));
68 70
69 run_loop_.reset(new base::RunLoop()); 71 run_loop_.reset(new base::RunLoop());
70 } 72 }
71 73
72 // MOCK_METHOD* doesn't support move only types. Work around this by having 74 // MOCK_METHOD* doesn't support move only types. Work around this by having
73 // an extra method. 75 // an extra method.
(...skipping 24 matching lines...) Expand all
98 media_renderer_client_binding_.Bind(GetProxy(&client_ptr)); 100 media_renderer_client_binding_.Bind(GetProxy(&client_ptr));
99 101
100 EXPECT_CALL(*this, OnRendererInitialized(expected_result)) 102 EXPECT_CALL(*this, OnRendererInitialized(expected_result))
101 .Times(Exactly(1)) 103 .Times(Exactly(1))
102 .WillOnce(InvokeWithoutArgs(run_loop_.get(), &base::RunLoop::Quit)); 104 .WillOnce(InvokeWithoutArgs(run_loop_.get(), &base::RunLoop::Quit));
103 media_renderer_->Initialize(client_ptr.Pass(), nullptr, video_stream.Pass(), 105 media_renderer_->Initialize(client_ptr.Pass(), nullptr, video_stream.Pass(),
104 base::Bind(&MediaAppTest::OnRendererInitialized, 106 base::Bind(&MediaAppTest::OnRendererInitialized,
105 base::Unretained(this))); 107 base::Unretained(this)));
106 } 108 }
107 109
110 MOCK_METHOD0(OnAppTerminated, void());
111
108 protected: 112 protected:
109 scoped_ptr<base::RunLoop> run_loop_; 113 scoped_ptr<base::RunLoop> run_loop_;
110 114
111 interfaces::ServiceFactoryPtr service_factory_; 115 interfaces::ServiceFactoryPtr service_factory_;
112 interfaces::ContentDecryptionModulePtr cdm_; 116 interfaces::ContentDecryptionModulePtr cdm_;
113 interfaces::MediaRendererPtr media_renderer_; 117 interfaces::MediaRendererPtr media_renderer_;
114 118
115 StrictMock<MockMediaRendererClient> media_renderer_client_; 119 StrictMock<MockMediaRendererClient> media_renderer_client_;
116 mojo::Binding<interfaces::MediaRendererClient> media_renderer_client_binding_; 120 mojo::Binding<interfaces::MediaRendererClient> media_renderer_client_binding_;
117 121
(...skipping 21 matching lines...) Expand all
139 TEST_F(MediaAppTest, InitializeRenderer_Success) { 143 TEST_F(MediaAppTest, InitializeRenderer_Success) {
140 InitializeRenderer(TestVideoConfig::Normal(), true); 144 InitializeRenderer(TestVideoConfig::Normal(), true);
141 run_loop_->Run(); 145 run_loop_->Run();
142 } 146 }
143 147
144 TEST_F(MediaAppTest, InitializeRenderer_InvalidConfig) { 148 TEST_F(MediaAppTest, InitializeRenderer_InvalidConfig) {
145 InitializeRenderer(TestVideoConfig::Invalid(), false); 149 InitializeRenderer(TestVideoConfig::Invalid(), false);
146 run_loop_->Run(); 150 run_loop_->Run();
147 } 151 }
148 152
153 TEST_F(MediaAppTest, Lifetime) {
154 // Disconnecting CDM and MediaRenderer services doesn't terminate the app.
155 cdm_.reset();
156 media_renderer_.reset();
157
158 // Disconnecting ServiceFactory service should terminate the app.
159 EXPECT_CALL(*this, OnAppTerminated())
160 .Times(Exactly(1))
161 .WillOnce(Invoke(run_loop_.get(), &base::RunLoop::Quit));
162 service_factory_.reset();
163
164 run_loop_->Run();
165 }
166
149 } // namespace media 167 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | media/mojo/services/mojo_media_application.h » ('j') | mojo/application/public/cpp/application_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698