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

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

Issue 1455833005: Convert ConnectToApplication to take a params class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 1 month 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/media_apptest.cc ('k') | mojo/application/public/cpp/BUILD.gn » ('j') | 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/strings/string_split.h" 10 #include "base/strings/string_split.h"
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 public: 638 public:
639 bool ShouldCreateDefaultRunLoop() override { return false; } 639 bool ShouldCreateDefaultRunLoop() override { return false; }
640 640
641 void SetUp() override { 641 void SetUp() override {
642 ApplicationTestBase::SetUp(); 642 ApplicationTestBase::SetUp();
643 InitializeMediaLibrary(); 643 InitializeMediaLibrary();
644 } 644 }
645 645
646 protected: 646 protected:
647 scoped_ptr<Renderer> CreateRenderer() override { 647 scoped_ptr<Renderer> CreateRenderer() override {
648 mojo::URLRequestPtr request(mojo::URLRequest::New()); 648 application_impl()->ConnectToService("mojo:media", &media_service_factory_);
649 request->url = mojo::String::From("mojo:media");
650 mojo::ServiceProvider* service_provider =
651 application_impl()
652 ->ConnectToApplication(request.Pass())
653 ->GetServiceProvider();
654
655 mojo::ConnectToService(service_provider, &media_service_factory_);
656 649
657 interfaces::RendererPtr mojo_renderer; 650 interfaces::RendererPtr mojo_renderer;
658 media_service_factory_->CreateRenderer(mojo::GetProxy(&mojo_renderer)); 651 media_service_factory_->CreateRenderer(mojo::GetProxy(&mojo_renderer));
659 652
660 return make_scoped_ptr(new MojoRendererImpl(message_loop_.task_runner(), 653 return make_scoped_ptr(new MojoRendererImpl(message_loop_.task_runner(),
661 mojo_renderer.Pass())); 654 mojo_renderer.Pass()));
662 } 655 }
663 656
664 private: 657 private:
665 interfaces::ServiceFactoryPtr media_service_factory_; 658 interfaces::ServiceFactoryPtr media_service_factory_;
(...skipping 1175 matching lines...) Expand 10 before | Expand all | Expand 10 after
1841 1834
1842 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { 1835 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
1843 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); 1836 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
1844 Play(); 1837 Play();
1845 ASSERT_TRUE(WaitUntilOnEnded()); 1838 ASSERT_TRUE(WaitUntilOnEnded());
1846 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), 1839 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
1847 demuxer_->GetStartTime()); 1840 demuxer_->GetStartTime());
1848 } 1841 }
1849 1842
1850 } // namespace media 1843 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/media_apptest.cc ('k') | mojo/application/public/cpp/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698