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

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

Issue 395703002: Fold {Audio|Video}Decoder::Stop() into the dtor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: minor fixes Created 6 years, 5 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 | Annotate | Revision Log
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" 8 #include "base/memory/scoped_ptr.h"
9 9
10 using ::testing::_; 10 using ::testing::_;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 } 49 }
50 50
51 VideoRotation MockDemuxerStream::video_rotation() { 51 VideoRotation MockDemuxerStream::video_rotation() {
52 return VIDEO_ROTATION_0; 52 return VIDEO_ROTATION_0;
53 } 53 }
54 54
55 MockVideoDecoder::MockVideoDecoder() { 55 MockVideoDecoder::MockVideoDecoder() {
56 EXPECT_CALL(*this, HasAlpha()).WillRepeatedly(Return(false)); 56 EXPECT_CALL(*this, HasAlpha()).WillRepeatedly(Return(false));
57 } 57 }
58 58
59 MockVideoDecoder::~MockVideoDecoder() {} 59 MockVideoDecoder::~MockVideoDecoder() {
60 Destroy();
61 }
60 62
61 MockAudioDecoder::MockAudioDecoder() {} 63 MockAudioDecoder::MockAudioDecoder() {}
62 64
63 MockAudioDecoder::~MockAudioDecoder() {} 65 MockAudioDecoder::~MockAudioDecoder() {
66 Destroy();
67 }
64 68
65 MockVideoRenderer::MockVideoRenderer() {} 69 MockVideoRenderer::MockVideoRenderer() {}
66 70
67 MockVideoRenderer::~MockVideoRenderer() {} 71 MockVideoRenderer::~MockVideoRenderer() {}
68 72
69 MockAudioRenderer::MockAudioRenderer() {} 73 MockAudioRenderer::MockAudioRenderer() {}
70 74
71 MockAudioRenderer::~MockAudioRenderer() {} 75 MockAudioRenderer::~MockAudioRenderer() {}
72 76
73 MockTextTrack::MockTextTrack() {} 77 MockTextTrack::MockTextTrack() {}
74 78
75 MockTextTrack::~MockTextTrack() {} 79 MockTextTrack::~MockTextTrack() {}
76 80
77 MockDecryptor::MockDecryptor() {} 81 MockDecryptor::MockDecryptor() {}
78 82
79 MockDecryptor::~MockDecryptor() {} 83 MockDecryptor::~MockDecryptor() {}
80 84
81 MockStatisticsCB::MockStatisticsCB() {} 85 MockStatisticsCB::MockStatisticsCB() {}
82 86
83 MockStatisticsCB::~MockStatisticsCB() {} 87 MockStatisticsCB::~MockStatisticsCB() {}
84 88
85 } // namespace media 89 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698