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

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

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 size_t current_position_; 646 size_t current_position_;
647 size_t initial_append_size_; 647 size_t initial_append_size_;
648 std::string mimetype_; 648 std::string mimetype_;
649 ChunkDemuxer* chunk_demuxer_; 649 ChunkDemuxer* chunk_demuxer_;
650 scoped_ptr<Demuxer> owned_chunk_demuxer_; 650 scoped_ptr<Demuxer> owned_chunk_demuxer_;
651 Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb_; 651 Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
652 base::TimeDelta last_timestamp_offset_; 652 base::TimeDelta last_timestamp_offset_;
653 }; 653 };
654 654
655 #if defined(MOJO_RENDERER) 655 #if defined(MOJO_RENDERER)
656 class PipelineIntegrationTestHost : public mojo::test::ApplicationTestBase, 656 class PipelineIntegrationTestHost : public shell::test::ApplicationTestBase,
657 public PipelineIntegrationTestBase { 657 public PipelineIntegrationTestBase {
658 public: 658 public:
659 bool ShouldCreateDefaultRunLoop() override { return false; } 659 bool ShouldCreateDefaultRunLoop() override { return false; }
660 660
661 void SetUp() override { 661 void SetUp() override {
662 ApplicationTestBase::SetUp(); 662 ApplicationTestBase::SetUp();
663 InitializeMediaLibrary(); 663 InitializeMediaLibrary();
664 } 664 }
665 665
666 protected: 666 protected:
(...skipping 1462 matching lines...) Expand 10 before | Expand all | Expand 10 after
2129 2129
2130 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { 2130 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
2131 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); 2131 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
2132 Play(); 2132 Play();
2133 ASSERT_TRUE(WaitUntilOnEnded()); 2133 ASSERT_TRUE(WaitUntilOnEnded());
2134 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), 2134 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
2135 demuxer_->GetStartTime()); 2135 demuxer_->GetStartTime());
2136 } 2136 }
2137 2137
2138 } // namespace media 2138 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/test_mojo_media_client.cc ('k') | mojo/public/cpp/bindings/tests/versioning_test_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698