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

Side by Side Diff: media/video/gpu_memory_buffer_video_frame_pool_unittest.cc

Issue 1965273003: Fix include path for moved thread_task_runner_handle.h header in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: merge up to r393009 Created 4 years, 7 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
« no previous file with comments | « media/mojo/services/test_mojo_media_client.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 <stdint.h> 5 #include <stdint.h>
6 #include <memory> 6 #include <memory>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/test/test_simple_task_runner.h" 9 #include "base/test/test_simple_task_runner.h"
10 #include "base/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
11 #include "gpu/command_buffer/client/gles2_interface_stub.h" 11 #include "gpu/command_buffer/client/gles2_interface_stub.h"
12 #include "media/base/video_frame.h" 12 #include "media/base/video_frame.h"
13 #include "media/renderers/mock_gpu_video_accelerator_factories.h" 13 #include "media/renderers/mock_gpu_video_accelerator_factories.h"
14 #include "media/video/gpu_memory_buffer_video_frame_pool.h" 14 #include "media/video/gpu_memory_buffer_video_frame_pool.h"
15 #include "testing/gmock/include/gmock/gmock.h" 15 #include "testing/gmock/include/gmock/gmock.h"
16 16
17 namespace media { 17 namespace media {
18 18
19 namespace { 19 namespace {
20 class TestGLES2Interface : public gpu::gles2::GLES2InterfaceStub { 20 class TestGLES2Interface : public gpu::gles2::GLES2InterfaceStub {
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 gpu_memory_buffer_pool_->MaybeCreateHardwareFrame( 304 gpu_memory_buffer_pool_->MaybeCreateHardwareFrame(
305 software_frame, base::Bind(MaybeCreateHardwareFrameCallback, &frame)); 305 software_frame, base::Bind(MaybeCreateHardwareFrameCallback, &frame));
306 306
307 RunUntilIdle(); 307 RunUntilIdle();
308 308
309 EXPECT_NE(software_frame.get(), frame.get()); 309 EXPECT_NE(software_frame.get(), frame.get());
310 EXPECT_EQ(3u, gles2_->gen_textures); 310 EXPECT_EQ(3u, gles2_->gen_textures);
311 } 311 }
312 312
313 } // namespace media 313 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/test_mojo_media_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698