| OLD | NEW |
| 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/mock_filters.h" | 10 #include "media/base/mock_filters.h" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 new MojoDemuxerStreamImpl(&video_demuxer_stream_, GetProxy(&video_stream)); | 80 new MojoDemuxerStreamImpl(&video_demuxer_stream_, GetProxy(&video_stream)); |
| 81 | 81 |
| 82 mojo::MediaRendererClientPtr client_ptr; | 82 mojo::MediaRendererClientPtr client_ptr; |
| 83 media_renderer_client_binding_.Bind(GetProxy(&client_ptr)); | 83 media_renderer_client_binding_.Bind(GetProxy(&client_ptr)); |
| 84 | 84 |
| 85 media_renderer_->Initialize( | 85 media_renderer_->Initialize( |
| 86 client_ptr.Pass(), nullptr, video_stream.Pass(), | 86 client_ptr.Pass(), nullptr, video_stream.Pass(), |
| 87 base::Bind(&OnRendererInitialized, run_loop_->QuitClosure())); | 87 base::Bind(&OnRendererInitialized, run_loop_->QuitClosure())); |
| 88 } | 88 } |
| 89 | 89 |
| 90 void OnAppTerminated() { | 90 void OnAppTerminated() { run_loop_->Quit(); } |
| 91 run_loop_->Quit(); | |
| 92 } | |
| 93 | 91 |
| 94 protected: | 92 protected: |
| 95 scoped_ptr<base::RunLoop> run_loop_; | 93 scoped_ptr<base::RunLoop> run_loop_; |
| 96 | 94 |
| 97 mojo::ContentDecryptionModulePtr cdm_; | 95 mojo::ContentDecryptionModulePtr cdm_; |
| 98 mojo::MediaRendererPtr media_renderer_; | 96 mojo::MediaRendererPtr media_renderer_; |
| 99 | 97 |
| 100 MockMediaRendererClient media_renderer_client_; | 98 MockMediaRendererClient media_renderer_client_; |
| 101 mojo::Binding<mojo::MediaRendererClient> media_renderer_client_binding_; | 99 mojo::Binding<mojo::MediaRendererClient> media_renderer_client_binding_; |
| 102 | 100 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 } | 135 } |
| 138 | 136 |
| 139 // The application is terminated after all services are disconnected. | 137 // The application is terminated after all services are disconnected. |
| 140 TEST_F(MediaAppTest, Lifetime) { | 138 TEST_F(MediaAppTest, Lifetime) { |
| 141 cdm_.reset(); | 139 cdm_.reset(); |
| 142 media_renderer_.reset(); | 140 media_renderer_.reset(); |
| 143 run_loop_->Run(); | 141 run_loop_->Run(); |
| 144 } | 142 } |
| 145 | 143 |
| 146 } // namespace media | 144 } // namespace media |
| OLD | NEW |