OLD | NEW |
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 698 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
709 void SetUp() override { | 709 void SetUp() override { |
710 ServiceTest::SetUp(); | 710 ServiceTest::SetUp(); |
711 InitializeMediaLibrary(); | 711 InitializeMediaLibrary(); |
712 } | 712 } |
713 | 713 |
714 protected: | 714 protected: |
715 std::unique_ptr<Renderer> CreateRenderer() override { | 715 std::unique_ptr<Renderer> CreateRenderer() override { |
716 connector()->ConnectToInterface("mojo:media", &media_service_factory_); | 716 connector()->ConnectToInterface("mojo:media", &media_service_factory_); |
717 | 717 |
718 mojom::RendererPtr mojo_renderer; | 718 mojom::RendererPtr mojo_renderer; |
719 media_service_factory_->CreateRenderer(mojo::GetProxy(&mojo_renderer)); | 719 media_service_factory_->CreateRenderer(std::string(), |
| 720 mojo::GetProxy(&mojo_renderer)); |
720 | 721 |
721 return base::WrapUnique(new MojoRenderer(message_loop_.task_runner(), | 722 return base::WrapUnique(new MojoRenderer(message_loop_.task_runner(), |
722 std::move(mojo_renderer))); | 723 std::move(mojo_renderer))); |
723 } | 724 } |
724 | 725 |
725 private: | 726 private: |
726 mojom::ServiceFactoryPtr media_service_factory_; | 727 mojom::ServiceFactoryPtr media_service_factory_; |
727 }; | 728 }; |
728 #else | 729 #else |
729 class PipelineIntegrationTestHost : public testing::Test, | 730 class PipelineIntegrationTestHost : public testing::Test, |
(...skipping 1669 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2399 | 2400 |
2400 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { | 2401 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { |
2401 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); | 2402 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); |
2402 Play(); | 2403 Play(); |
2403 ASSERT_TRUE(WaitUntilOnEnded()); | 2404 ASSERT_TRUE(WaitUntilOnEnded()); |
2404 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), | 2405 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), |
2405 demuxer_->GetStartTime()); | 2406 demuxer_->GetStartTime()); |
2406 } | 2407 } |
2407 | 2408 |
2408 } // namespace media | 2409 } // namespace media |
OLD | NEW |