| 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 670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 681 PipelineIntegrationTestHost() | 681 PipelineIntegrationTestHost() |
| 682 : shell::test::ServiceTest("exe:media_pipeline_integration_shelltests") {} | 682 : shell::test::ServiceTest("exe:media_pipeline_integration_shelltests") {} |
| 683 | 683 |
| 684 void SetUp() override { | 684 void SetUp() override { |
| 685 ServiceTest::SetUp(); | 685 ServiceTest::SetUp(); |
| 686 InitializeMediaLibrary(); | 686 InitializeMediaLibrary(); |
| 687 } | 687 } |
| 688 | 688 |
| 689 protected: | 689 protected: |
| 690 std::unique_ptr<Renderer> CreateRenderer() override { | 690 std::unique_ptr<Renderer> CreateRenderer() override { |
| 691 connector()->ConnectToInterface("mojo:media", &media_service_factory_); | 691 connector()->ConnectToInterface("service:media", &media_service_factory_); |
| 692 | 692 |
| 693 mojom::RendererPtr mojo_renderer; | 693 mojom::RendererPtr mojo_renderer; |
| 694 media_service_factory_->CreateRenderer(std::string(), | 694 media_service_factory_->CreateRenderer(std::string(), |
| 695 mojo::GetProxy(&mojo_renderer)); | 695 mojo::GetProxy(&mojo_renderer)); |
| 696 | 696 |
| 697 return base::MakeUnique<MojoRenderer>(message_loop_.task_runner(), | 697 return base::MakeUnique<MojoRenderer>(message_loop_.task_runner(), |
| 698 std::move(mojo_renderer)); | 698 std::move(mojo_renderer)); |
| 699 } | 699 } |
| 700 | 700 |
| 701 private: | 701 private: |
| (...skipping 1753 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2455 | 2455 |
| 2456 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { | 2456 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { |
| 2457 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); | 2457 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); |
| 2458 Play(); | 2458 Play(); |
| 2459 ASSERT_TRUE(WaitUntilOnEnded()); | 2459 ASSERT_TRUE(WaitUntilOnEnded()); |
| 2460 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), | 2460 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), |
| 2461 demuxer_->GetStartTime()); | 2461 demuxer_->GetStartTime()); |
| 2462 } | 2462 } |
| 2463 | 2463 |
| 2464 } // namespace media | 2464 } // namespace media |
| OLD | NEW |