| 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 657 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 668 Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb_; | 668 Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb_; |
| 669 base::TimeDelta last_timestamp_offset_; | 669 base::TimeDelta last_timestamp_offset_; |
| 670 }; | 670 }; |
| 671 | 671 |
| 672 // TODO(xhwang): These tests have been disabled for some time as apptests and no | 672 // TODO(xhwang): These tests have been disabled for some time as apptests and no |
| 673 // longer pass. They need to be reconstituted as shell tests. | 673 // longer pass. They need to be reconstituted as shell tests. |
| 674 // Currently there are compile issues which must be resolved, | 674 // Currently there are compile issues which must be resolved, |
| 675 // preferably by eliminating multiple inheritance here which is | 675 // preferably by eliminating multiple inheritance here which is |
| 676 // banned by Google C++ style. | 676 // banned by Google C++ style. |
| 677 #if defined(MOJO_RENDERER) && defined(ENABLE_MOJO_PIPELINE_INTEGRATION_TEST) | 677 #if defined(MOJO_RENDERER) && defined(ENABLE_MOJO_PIPELINE_INTEGRATION_TEST) |
| 678 class PipelineIntegrationTestHost : public shell::test::ServiceTest, | 678 class PipelineIntegrationTestHost : public service_manager::test::ServiceTest, |
| 679 public PipelineIntegrationTestBase { | 679 public PipelineIntegrationTestBase { |
| 680 public: | 680 public: |
| 681 PipelineIntegrationTestHost() | 681 PipelineIntegrationTestHost() |
| 682 : shell::test::ServiceTest("exe:media_pipeline_integration_shelltests") {} | 682 : service_manager::test::ServiceTest( |
| 683 "exe:media_pipeline_integration_shelltests") {} |
| 683 | 684 |
| 684 void SetUp() override { | 685 void SetUp() override { |
| 685 ServiceTest::SetUp(); | 686 ServiceTest::SetUp(); |
| 686 InitializeMediaLibrary(); | 687 InitializeMediaLibrary(); |
| 687 } | 688 } |
| 688 | 689 |
| 689 protected: | 690 protected: |
| 690 std::unique_ptr<Renderer> CreateRenderer() override { | 691 std::unique_ptr<Renderer> CreateRenderer() override { |
| 691 connector()->ConnectToInterface("service:media", &media_service_factory_); | 692 connector()->ConnectToInterface("service:media", &media_service_factory_); |
| 692 | 693 |
| (...skipping 1784 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2477 | 2478 |
| 2478 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { | 2479 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { |
| 2479 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); | 2480 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); |
| 2480 Play(); | 2481 Play(); |
| 2481 ASSERT_TRUE(WaitUntilOnEnded()); | 2482 ASSERT_TRUE(WaitUntilOnEnded()); |
| 2482 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), | 2483 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), |
| 2483 demuxer_->GetStartTime()); | 2484 demuxer_->GetStartTime()); |
| 2484 } | 2485 } |
| 2485 | 2486 |
| 2486 } // namespace media | 2487 } // namespace media |
| OLD | NEW |