| OLD | NEW |
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "base/scoped_ptr.h" |
| 5 #include "media/base/mock_ffmpeg.h" | 6 #include "media/base/mock_ffmpeg.h" |
| 6 #include "media/base/mock_filters.h" | 7 #include "media/base/mock_filters.h" |
| 7 #include "media/ffmpeg/ffmpeg_common.h" | 8 #include "media/ffmpeg/ffmpeg_common.h" |
| 8 #include "media/filters/ffmpeg_glue.h" | 9 #include "media/filters/ffmpeg_glue.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
| 10 | 11 |
| 11 using ::testing::_; | 12 using ::testing::_; |
| 12 using ::testing::DoAll; | 13 using ::testing::DoAll; |
| 13 using ::testing::InSequence; | 14 using ::testing::InSequence; |
| 14 using ::testing::Return; | 15 using ::testing::Return; |
| (...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 | 320 |
| 320 // Remove our own reference, we shouldn't be destroyed yet. | 321 // Remove our own reference, we shouldn't be destroyed yet. |
| 321 mock_ffmpeg_.CheckPoint(0); | 322 mock_ffmpeg_.CheckPoint(0); |
| 322 protocol.reset(); | 323 protocol.reset(); |
| 323 | 324 |
| 324 // ~FFmpegGlue() will be called when this unit test finishes execution. By | 325 // ~FFmpegGlue() will be called when this unit test finishes execution. By |
| 325 // leaving something inside FFmpegGlue's map we get to test our cleanup code. | 326 // leaving something inside FFmpegGlue's map we get to test our cleanup code. |
| 326 } | 327 } |
| 327 | 328 |
| 328 } // namespace media | 329 } // namespace media |
| OLD | NEW |
|---|
Chromium Code Reviews
