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

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

Issue 2698063002: Mojo C++ bindings: remove usage of AssociatedGroup from media/ (Closed)
Patch Set: Created 3 years, 10 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
« no previous file with comments | « media/mojo/clients/mojo_video_decoder.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 interface_factory_->CreateRenderer(std::string(), 125 interface_factory_->CreateRenderer(std::string(),
126 mojo::MakeRequest(&renderer_)); 126 mojo::MakeRequest(&renderer_));
127 127
128 video_stream_.set_video_decoder_config(video_config); 128 video_stream_.set_video_decoder_config(video_config);
129 129
130 mojom::DemuxerStreamPtr video_stream_proxy; 130 mojom::DemuxerStreamPtr video_stream_proxy;
131 mojo_video_stream_.reset(new MojoDemuxerStreamImpl( 131 mojo_video_stream_.reset(new MojoDemuxerStreamImpl(
132 &video_stream_, MakeRequest(&video_stream_proxy))); 132 &video_stream_, MakeRequest(&video_stream_proxy)));
133 133
134 mojom::RendererClientAssociatedPtrInfo client_ptr_info; 134 mojom::RendererClientAssociatedPtrInfo client_ptr_info;
135 renderer_client_binding_.Bind(&client_ptr_info, 135 renderer_client_binding_.Bind(&client_ptr_info);
136 renderer_.associated_group());
137 136
138 EXPECT_CALL(*this, OnRendererInitialized(expected_result)) 137 EXPECT_CALL(*this, OnRendererInitialized(expected_result))
139 .Times(Exactly(1)) 138 .Times(Exactly(1))
140 .WillOnce(InvokeWithoutArgs(run_loop_.get(), &base::RunLoop::Quit)); 139 .WillOnce(InvokeWithoutArgs(run_loop_.get(), &base::RunLoop::Quit));
141 std::vector<mojom::DemuxerStreamPtr> streams; 140 std::vector<mojom::DemuxerStreamPtr> streams;
142 streams.push_back(std::move(video_stream_proxy)); 141 streams.push_back(std::move(video_stream_proxy));
143 renderer_->Initialize(std::move(client_ptr_info), std::move(streams), 142 renderer_->Initialize(std::move(client_ptr_info), std::move(streams),
144 base::nullopt, base::nullopt, 143 base::nullopt, base::nullopt,
145 base::Bind(&MediaServiceTest::OnRendererInitialized, 144 base::Bind(&MediaServiceTest::OnRendererInitialized,
146 base::Unretained(this))); 145 base::Unretained(this)));
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 // close the connection. 213 // close the connection.
215 EXPECT_CALL(*this, ConnectionClosed()) 214 EXPECT_CALL(*this, ConnectionClosed())
216 .Times(Exactly(1)) 215 .Times(Exactly(1))
217 .WillOnce(Invoke(run_loop_.get(), &base::RunLoop::Quit)); 216 .WillOnce(Invoke(run_loop_.get(), &base::RunLoop::Quit));
218 interface_factory_.reset(); 217 interface_factory_.reset();
219 218
220 run_loop_->Run(); 219 run_loop_->Run();
221 } 220 }
222 221
223 } // namespace media 222 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/clients/mojo_video_decoder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698