[MappableSI] Remove MockGpuMemoryBufferManager.
Remove MockGpuMemoryBufferManager and all of its usages. It is no longer used by any clients or tests since all were converted to use MappableSI instead of GMB. Bug: 394919676 Change-Id: I8453de6c8fa8bdcc31b40fd7aabbca2406ab4538 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6237071 Reviewed-by: Dale Curtis <dalecurtis@chromium.org> Auto-Submit: vikas soni <vikassoni@chromium.org> Commit-Queue: Dale Curtis <dalecurtis@chromium.org> Cr-Commit-Position: refs/heads/main@{#1417081}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
64f839aa2b
commit
b1c0160839
@ -411,8 +411,6 @@ source_set("test_support") {
|
||||
"video/mock_device.h",
|
||||
"video/mock_device_factory.cc",
|
||||
"video/mock_device_factory.h",
|
||||
"video/mock_gpu_memory_buffer_manager.cc",
|
||||
"video/mock_gpu_memory_buffer_manager.h",
|
||||
"video/mock_video_capture_device_client.cc",
|
||||
"video/mock_video_capture_device_client.h",
|
||||
"video/mock_video_frame_receiver.cc",
|
||||
|
@ -13,7 +13,6 @@
|
||||
#include "base/test/task_environment.h"
|
||||
#include "gpu/command_buffer/client/test_shared_image_interface.h"
|
||||
#include "media/base/test_data_util.h"
|
||||
#include "media/capture/video/mock_gpu_memory_buffer_manager.h"
|
||||
#include "media/capture/video/video_capture_gpu_channel_host.h"
|
||||
#include "media/video/fake_gpu_memory_buffer.h"
|
||||
#include "testing/gmock/include/gmock/gmock.h"
|
||||
|
@ -7,7 +7,6 @@
|
||||
#include "base/test/bind.h"
|
||||
#include "base/test/task_environment.h"
|
||||
#include "components/viz/test/test_context_provider.h"
|
||||
#include "media/capture/video/mock_gpu_memory_buffer_manager.h"
|
||||
#include "media/capture/video/video_capture_gpu_channel_host.h"
|
||||
#include "testing/gmock/include/gmock/gmock.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
@ -1,44 +0,0 @@
|
||||
// Copyright 2017 The Chromium Authors
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "media/capture/video/mock_gpu_memory_buffer_manager.h"
|
||||
|
||||
#include "build/build_config.h"
|
||||
#include "media/video/fake_gpu_memory_buffer.h"
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
#include "media/capture/video/chromeos/request_manager.h"
|
||||
#endif
|
||||
|
||||
namespace media {
|
||||
namespace unittest_internal {
|
||||
|
||||
MockGpuMemoryBufferManager::MockGpuMemoryBufferManager() = default;
|
||||
|
||||
MockGpuMemoryBufferManager::~MockGpuMemoryBufferManager() = default;
|
||||
|
||||
// static
|
||||
std::unique_ptr<gfx::GpuMemoryBuffer>
|
||||
MockGpuMemoryBufferManager::CreateFakeGpuMemoryBuffer(
|
||||
const gfx::Size& size,
|
||||
gfx::BufferFormat format,
|
||||
gfx::BufferUsage usage,
|
||||
gpu::SurfaceHandle surface_handle,
|
||||
base::WaitableEvent* shutdown_event) {
|
||||
auto gmb = std::make_unique<FakeGpuMemoryBuffer>(size, format);
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
// For faking a valid JPEG blob buffer.
|
||||
if (base::checked_cast<size_t>(size.width()) >= sizeof(Camera3JpegBlob)) {
|
||||
Camera3JpegBlob* header = reinterpret_cast<Camera3JpegBlob*>(
|
||||
reinterpret_cast<uintptr_t>(gmb->memory(0)) + size.width() -
|
||||
sizeof(Camera3JpegBlob));
|
||||
header->jpeg_blob_id = kCamera3JpegBlobId;
|
||||
header->jpeg_size = size.width();
|
||||
}
|
||||
#endif
|
||||
return gmb;
|
||||
}
|
||||
|
||||
} // namespace unittest_internal
|
||||
} // namespace media
|
@ -1,52 +0,0 @@
|
||||
// Copyright 2017 The Chromium Authors
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#ifndef MEDIA_CAPTURE_VIDEO_MOCK_GPU_MEMORY_BUFFER_MANAGER_H_
|
||||
#define MEDIA_CAPTURE_VIDEO_MOCK_GPU_MEMORY_BUFFER_MANAGER_H_
|
||||
|
||||
#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
|
||||
#include "gpu/command_buffer/common/sync_token.h"
|
||||
#include "testing/gmock/include/gmock/gmock.h"
|
||||
#include "ui/gfx/color_space.h"
|
||||
|
||||
namespace media {
|
||||
namespace unittest_internal {
|
||||
|
||||
class MockGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager {
|
||||
public:
|
||||
MockGpuMemoryBufferManager();
|
||||
|
||||
MockGpuMemoryBufferManager(const MockGpuMemoryBufferManager&) = delete;
|
||||
MockGpuMemoryBufferManager& operator=(const MockGpuMemoryBufferManager&) =
|
||||
delete;
|
||||
|
||||
~MockGpuMemoryBufferManager() override;
|
||||
|
||||
MOCK_METHOD5(CreateGpuMemoryBuffer,
|
||||
std::unique_ptr<gfx::GpuMemoryBuffer>(
|
||||
const gfx::Size& size,
|
||||
gfx::BufferFormat format,
|
||||
gfx::BufferUsage usage,
|
||||
gpu::SurfaceHandle surface_handle,
|
||||
base::WaitableEvent* shutdown_event));
|
||||
|
||||
MOCK_METHOD3(CopyGpuMemoryBufferAsync,
|
||||
void(gfx::GpuMemoryBufferHandle buffer_handle,
|
||||
base::UnsafeSharedMemoryRegion memory_region,
|
||||
base::OnceCallback<void(bool)> callback));
|
||||
|
||||
MOCK_METHOD0(IsConnected, bool());
|
||||
|
||||
static std::unique_ptr<gfx::GpuMemoryBuffer> CreateFakeGpuMemoryBuffer(
|
||||
const gfx::Size& size,
|
||||
gfx::BufferFormat format,
|
||||
gfx::BufferUsage usage,
|
||||
gpu::SurfaceHandle surface_handle,
|
||||
base::WaitableEvent* shutdown_event);
|
||||
};
|
||||
|
||||
} // namespace unittest_internal
|
||||
} // namespace media
|
||||
|
||||
#endif // MEDIA_CAPTURE_VIDEO_MOCK_GPU_MEMORY_BUFFER_MANAGER_H_
|
Reference in New Issue
Block a user