| Index: media/gpu/video_decode_accelerator_unittest.cc
|
| diff --git a/media/gpu/video_decode_accelerator_unittest.cc b/media/gpu/video_decode_accelerator_unittest.cc
|
| index 365859f06397bc8f15358b8a43d31bf95d7a0163..198176912361c0b9015914dd72ab9b075ca2cb9a 100644
|
| --- a/media/gpu/video_decode_accelerator_unittest.cc
|
| +++ b/media/gpu/video_decode_accelerator_unittest.cc
|
| @@ -1493,16 +1493,17 @@ TEST_P(VideoDecodeAcceleratorParamTest, TestSimpleDecode) {
|
| }
|
| }
|
|
|
| - std::unique_ptr<NotesVector> notes2(new NotesVector);
|
| - notes2->swap(notes);
|
| std::unique_ptr<ClientsVector> clients2(new ClientsVector);
|
| clients2->swap(clients);
|
| + std::unique_ptr<NotesVector> notes2(new NotesVector);
|
| + notes2->swap(notes);
|
|
|
| + // |clients| must be deleted first because |clients| use |notes2|.
|
| g_env->GetRenderingTaskRunner()->PostTask(
|
| - FROM_HERE, base::Bind(&Delete<NotesVector>, base::Passed(¬es2)));
|
| + FROM_HERE, base::Bind(&Delete<ClientsVector>, base::Passed(&clients2)));
|
|
|
| g_env->GetRenderingTaskRunner()->PostTask(
|
| - FROM_HERE, base::Bind(&Delete<ClientsVector>, base::Passed(&clients2)));
|
| + FROM_HERE, base::Bind(&Delete<NotesVector>, base::Passed(¬es2)));
|
|
|
| WaitUntilIdle();
|
| };
|
|
|