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

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

Issue 1687693002: Rename ConnectToService to ConnectToInterface() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sp2
Patch Set: . Created 4 years, 10 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 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 public: 670 public:
671 bool ShouldCreateDefaultRunLoop() override { return false; } 671 bool ShouldCreateDefaultRunLoop() override { return false; }
672 672
673 void SetUp() override { 673 void SetUp() override {
674 ApplicationTestBase::SetUp(); 674 ApplicationTestBase::SetUp();
675 InitializeMediaLibrary(); 675 InitializeMediaLibrary();
676 } 676 }
677 677
678 protected: 678 protected:
679 scoped_ptr<Renderer> CreateRenderer() override { 679 scoped_ptr<Renderer> CreateRenderer() override {
680 shell()->ConnectToService("mojo:media", &media_service_factory_); 680 shell()->ConnectToInterface("mojo:media", &media_service_factory_);
681 681
682 interfaces::RendererPtr mojo_renderer; 682 interfaces::RendererPtr mojo_renderer;
683 media_service_factory_->CreateRenderer(mojo::GetProxy(&mojo_renderer)); 683 media_service_factory_->CreateRenderer(mojo::GetProxy(&mojo_renderer));
684 684
685 return make_scoped_ptr(new MojoRendererImpl(message_loop_.task_runner(), 685 return make_scoped_ptr(new MojoRendererImpl(message_loop_.task_runner(),
686 std::move(mojo_renderer))); 686 std::move(mojo_renderer)));
687 } 687 }
688 688
689 private: 689 private:
690 interfaces::ServiceFactoryPtr media_service_factory_; 690 interfaces::ServiceFactoryPtr media_service_factory_;
(...skipping 1354 matching lines...) Expand 10 before | Expand all | Expand 10 after
2045 2045
2046 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { 2046 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
2047 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); 2047 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
2048 Play(); 2048 Play();
2049 ASSERT_TRUE(WaitUntilOnEnded()); 2049 ASSERT_TRUE(WaitUntilOnEnded());
2050 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), 2050 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
2051 demuxer_->GetStartTime()); 2051 demuxer_->GetStartTime());
2052 } 2052 }
2053 2053
2054 } // namespace media 2054 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/android_mojo_media_client.cc ('k') | mojo/public/cpp/bindings/tests/versioning_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698