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

Side by Side Diff: media/base/mock_filters.cc

Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-media-base: android 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/base/mock_filters.h ('k') | media/base/mock_media_log.h » ('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 "media/base/mock_filters.h" 5 #include "media/base/mock_filters.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h"
9 8
10 using ::testing::_; 9 using ::testing::_;
11 using ::testing::Invoke; 10 using ::testing::Invoke;
12 using ::testing::NotNull; 11 using ::testing::NotNull;
13 using ::testing::Return; 12 using ::testing::Return;
14 13
15 namespace media { 14 namespace media {
16 15
17 MockPipeline::MockPipeline() {} 16 MockPipeline::MockPipeline() {}
18 17
19 MockPipeline::~MockPipeline() {} 18 MockPipeline::~MockPipeline() {}
20 19
21 void MockPipeline::Start(Demuxer* demuxer, 20 void MockPipeline::Start(Demuxer* demuxer,
22 scoped_ptr<Renderer> renderer, 21 std::unique_ptr<Renderer> renderer,
23 const base::Closure& ended_cb, 22 const base::Closure& ended_cb,
24 const PipelineStatusCB& error_cb, 23 const PipelineStatusCB& error_cb,
25 const PipelineStatusCB& seek_cb, 24 const PipelineStatusCB& seek_cb,
26 const PipelineMetadataCB& metadata_cb, 25 const PipelineMetadataCB& metadata_cb,
27 const BufferingStateCB& buffering_state_cb, 26 const BufferingStateCB& buffering_state_cb,
28 const base::Closure& duration_change_cb, 27 const base::Closure& duration_change_cb,
29 const AddTextTrackCB& add_text_track_cb, 28 const AddTextTrackCB& add_text_track_cb,
30 const base::Closure& waiting_for_decryption_key_cb) { 29 const base::Closure& waiting_for_decryption_key_cb) {
31 Start(demuxer, &renderer, ended_cb, error_cb, seek_cb, metadata_cb, 30 Start(demuxer, &renderer, ended_cb, error_cb, seek_cb, metadata_cb,
32 buffering_state_cb, duration_change_cb, add_text_track_cb, 31 buffering_state_cb, duration_change_cb, add_text_track_cb,
33 waiting_for_decryption_key_cb); 32 waiting_for_decryption_key_cb);
34 } 33 }
35 34
36 void MockPipeline::Resume(scoped_ptr<Renderer> renderer, 35 void MockPipeline::Resume(std::unique_ptr<Renderer> renderer,
37 base::TimeDelta timestamp, 36 base::TimeDelta timestamp,
38 const PipelineStatusCB& seek_cb) { 37 const PipelineStatusCB& seek_cb) {
39 Resume(&renderer, timestamp, seek_cb); 38 Resume(&renderer, timestamp, seek_cb);
40 } 39 }
41 40
42 MockDemuxer::MockDemuxer() {} 41 MockDemuxer::MockDemuxer() {}
43 42
44 MockDemuxer::~MockDemuxer() {} 43 MockDemuxer::~MockDemuxer() {}
45 44
46 std::string MockDemuxer::GetDisplayName() const { 45 std::string MockDemuxer::GetDisplayName() const {
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 134
136 MockCdmContext::MockCdmContext() {} 135 MockCdmContext::MockCdmContext() {}
137 136
138 MockCdmContext::~MockCdmContext() {} 137 MockCdmContext::~MockCdmContext() {}
139 138
140 int MockCdmContext::GetCdmId() const { 139 int MockCdmContext::GetCdmId() const {
141 return CdmContext::kInvalidCdmId; 140 return CdmContext::kInvalidCdmId;
142 } 141 }
143 142
144 } // namespace media 143 } // namespace media
OLDNEW
« no previous file with comments | « media/base/mock_filters.h ('k') | media/base/mock_media_log.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698