Chromium Code Reviews| Index: content/common/gpu/media/android_video_decode_accelerator_unittest.cc |
| diff --git a/content/common/gpu/media/android_video_decode_accelerator_unittest.cc b/content/common/gpu/media/android_video_decode_accelerator_unittest.cc |
| index efd5b75a5ca27ae6487f78b40c0c41c3e78dfaf6..e62760a7ac2cf61cc4722f71360080710cac17b3 100644 |
| --- a/content/common/gpu/media/android_video_decode_accelerator_unittest.cc |
| +++ b/content/common/gpu/media/android_video_decode_accelerator_unittest.cc |
| @@ -8,6 +8,7 @@ |
| #include "base/bind.h" |
| #include "base/logging.h" |
| #include "base/memory/scoped_ptr.h" |
| +#include "content/common/gpu/media/android_copying_backing_strategy.h" |
| #include "content/common/gpu/media/android_video_decode_accelerator.h" |
| #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" |
| #include "media/base/android/media_codec_bridge.h" |
| @@ -63,7 +64,10 @@ class AndroidVideoDecodeAcceleratorTest : public testing::Test { |
| scoped_ptr<MockVideoDecodeAcceleratorClient> client( |
| new MockVideoDecodeAcceleratorClient()); |
| accelerator_.reset(new AndroidVideoDecodeAccelerator( |
| - decoder->AsWeakPtr(), base::Bind(&MockMakeContextCurrent))); |
| + decoder->AsWeakPtr(), base::Bind(&MockMakeContextCurrent), |
| + make_scoped_ptr(new AndroidCopyingBackingStrategy()))); |
| + // scoped_ptr<AndroidVideoDecodeAccelerator::BackingStrategy>( |
|
sandersd (OOO until July 31)
2015/09/10 20:28:20
Remove commented code.
liberato (no reviews please)
2015/09/14 17:41:28
whoops. done.
|
| + // new AndroidCopyingBackingStrategy()))); |
| } |
| bool Configure(media::VideoCodec codec) { |