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

Side by Side Diff: media/test/pipeline_integration_test.cc

Issue 2589663003: mojo:: Rename mojo::GetProxy() to mojo::MakeRequest() (Closed)
Patch Set: Rebase Created 4 years 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/remoting/remoting_source_impl.cc ('k') | mojo/common/common_custom_types_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 } 684 }
685 685
686 protected: 686 protected:
687 std::unique_ptr<Renderer> CreateRenderer( 687 std::unique_ptr<Renderer> CreateRenderer(
688 ScopedVector<VideoDecoder> prepend_video_decoders, 688 ScopedVector<VideoDecoder> prepend_video_decoders,
689 ScopedVector<AudioDecoder> prepend_audio_decoders) override { 689 ScopedVector<AudioDecoder> prepend_audio_decoders) override {
690 connector()->ConnectToInterface("media", &media_interface_factory_); 690 connector()->ConnectToInterface("media", &media_interface_factory_);
691 691
692 mojom::RendererPtr mojo_renderer; 692 mojom::RendererPtr mojo_renderer;
693 media_interface_factory_->CreateRenderer(std::string(), 693 media_interface_factory_->CreateRenderer(std::string(),
694 mojo::GetProxy(&mojo_renderer)); 694 mojo::MakeRequest(&mojo_renderer));
695 695
696 return base::MakeUnique<MojoRenderer>(message_loop_.task_runner(), 696 return base::MakeUnique<MojoRenderer>(message_loop_.task_runner(),
697 std::move(mojo_renderer)); 697 std::move(mojo_renderer));
698 } 698 }
699 699
700 private: 700 private:
701 mojom::InterfaceFactoryPtr media_interface_factory_; 701 mojom::InterfaceFactoryPtr media_interface_factory_;
702 }; 702 };
703 #else 703 #else
704 class PipelineIntegrationTestHost : public testing::Test, 704 class PipelineIntegrationTestHost : public testing::Test,
(...skipping 1847 matching lines...) Expand 10 before | Expand all | Expand 10 after
2552 2552
2553 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { 2553 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
2554 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); 2554 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
2555 Play(); 2555 Play();
2556 ASSERT_TRUE(WaitUntilOnEnded()); 2556 ASSERT_TRUE(WaitUntilOnEnded());
2557 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), 2557 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
2558 demuxer_->GetStartTime()); 2558 demuxer_->GetStartTime());
2559 } 2559 }
2560 2560
2561 } // namespace media 2561 } // namespace media
OLDNEW
« no previous file with comments | « media/remoting/remoting_source_impl.cc ('k') | mojo/common/common_custom_types_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698