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

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

Issue 1977173002: Rename media::interfaces to media::mojom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android + chromeos files Created 4 years, 7 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/services/test_manifest.json ('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 (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 664 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 675
676 void SetUp() override { 676 void SetUp() override {
677 ShellTest::SetUp(); 677 ShellTest::SetUp();
678 InitializeMediaLibrary(); 678 InitializeMediaLibrary();
679 } 679 }
680 680
681 protected: 681 protected:
682 std::unique_ptr<Renderer> CreateRenderer() override { 682 std::unique_ptr<Renderer> CreateRenderer() override {
683 connector()->ConnectToInterface("mojo:media", &media_service_factory_); 683 connector()->ConnectToInterface("mojo:media", &media_service_factory_);
684 684
685 interfaces::RendererPtr mojo_renderer; 685 mojom::RendererPtr mojo_renderer;
686 media_service_factory_->CreateRenderer(mojo::GetProxy(&mojo_renderer)); 686 media_service_factory_->CreateRenderer(mojo::GetProxy(&mojo_renderer));
687 687
688 return base::WrapUnique(new MojoRendererImpl(message_loop_.task_runner(), 688 return base::WrapUnique(new MojoRendererImpl(message_loop_.task_runner(),
689 std::move(mojo_renderer))); 689 std::move(mojo_renderer)));
690 } 690 }
691 691
692 private: 692 private:
693 interfaces::ServiceFactoryPtr media_service_factory_; 693 mojom::ServiceFactoryPtr media_service_factory_;
694 }; 694 };
695 #else 695 #else
696 class PipelineIntegrationTestHost : public testing::Test, 696 class PipelineIntegrationTestHost : public testing::Test,
697 public PipelineIntegrationTestBase {}; 697 public PipelineIntegrationTestBase {};
698 #endif // defined(MOJO_RENDERER) 698 #endif // defined(MOJO_RENDERER)
699 699
700 class PipelineIntegrationTest : public PipelineIntegrationTestHost { 700 class PipelineIntegrationTest : public PipelineIntegrationTestHost {
701 public: 701 public:
702 PipelineStatus StartPipelineWithMediaSource(MockMediaSource* source) { 702 PipelineStatus StartPipelineWithMediaSource(MockMediaSource* source) {
703 return StartPipelineWithMediaSource(source, kNormal); 703 return StartPipelineWithMediaSource(source, kNormal);
(...skipping 1469 matching lines...) Expand 10 before | Expand all | Expand 10 after
2173 2173
2174 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { 2174 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
2175 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); 2175 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
2176 Play(); 2176 Play();
2177 ASSERT_TRUE(WaitUntilOnEnded()); 2177 ASSERT_TRUE(WaitUntilOnEnded());
2178 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), 2178 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
2179 demuxer_->GetStartTime()); 2179 demuxer_->GetStartTime());
2180 } 2180 }
2181 2181
2182 } // namespace media 2182 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/test_manifest.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698