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

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

Issue 2253943004: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
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 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 } 710 }
711 711
712 protected: 712 protected:
713 std::unique_ptr<Renderer> CreateRenderer() override { 713 std::unique_ptr<Renderer> CreateRenderer() override {
714 connector()->ConnectToInterface("mojo:media", &media_service_factory_); 714 connector()->ConnectToInterface("mojo:media", &media_service_factory_);
715 715
716 mojom::RendererPtr mojo_renderer; 716 mojom::RendererPtr mojo_renderer;
717 media_service_factory_->CreateRenderer(std::string(), 717 media_service_factory_->CreateRenderer(std::string(),
718 mojo::GetProxy(&mojo_renderer)); 718 mojo::GetProxy(&mojo_renderer));
719 719
720 return base::WrapUnique(new MojoRenderer(message_loop_.task_runner(), 720 return base::MakeUnique<MojoRenderer>(message_loop_.task_runner(),
721 std::move(mojo_renderer))); 721 std::move(mojo_renderer));
722 } 722 }
723 723
724 private: 724 private:
725 mojom::ServiceFactoryPtr media_service_factory_; 725 mojom::ServiceFactoryPtr media_service_factory_;
726 }; 726 };
727 #else 727 #else
728 class PipelineIntegrationTestHost : public testing::Test, 728 class PipelineIntegrationTestHost : public testing::Test,
729 public PipelineIntegrationTestBase {}; 729 public PipelineIntegrationTestBase {};
730 #endif // defined(MOJO_RENDERER) 730 #endif // defined(MOJO_RENDERER)
731 731
(...skipping 1666 matching lines...) Expand 10 before | Expand all | Expand 10 after
2398 2398
2399 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { 2399 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
2400 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); 2400 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
2401 Play(); 2401 Play();
2402 ASSERT_TRUE(WaitUntilOnEnded()); 2402 ASSERT_TRUE(WaitUntilOnEnded());
2403 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), 2403 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
2404 demuxer_->GetStartTime()); 2404 demuxer_->GetStartTime());
2405 } 2405 }
2406 2406
2407 } // namespace media 2407 } // namespace media
OLDNEW
« no previous file with comments | « media/renderers/mock_gpu_video_accelerator_factories.cc ('k') | media/test/pipeline_integration_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698