| OLD | NEW |
|---|
| 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 MockTimeSource::~MockTimeSource() {} | 101 MockTimeSource::~MockTimeSource() {} |
| 102 | 102 |
| 103 MockTextTrack::MockTextTrack() {} | 103 MockTextTrack::MockTextTrack() {} |
| 104 | 104 |
| 105 MockTextTrack::~MockTextTrack() {} | 105 MockTextTrack::~MockTextTrack() {} |
| 106 | 106 |
| 107 MockDecryptor::MockDecryptor() {} | 107 MockDecryptor::MockDecryptor() {} |
| 108 | 108 |
| 109 MockDecryptor::~MockDecryptor() {} | 109 MockDecryptor::~MockDecryptor() {} |
| 110 | 110 |
| 111 MockCdmContext::MockCdmContext() {} |
| 112 |
| 113 MockCdmContext::~MockCdmContext() {} |
| 114 |
| 115 int MockCdmContext::GetCdmId() const { |
| 116 return CdmContext::kInvalidCdmId; |
| 117 } |
| 118 |
| 111 } // namespace media | 119 } // namespace media |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1423163004:
media: Replace DecryptorReadyCB with CdmReadyCB. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master