| Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| index fafdb37001a6537037858f200ea6ad83c2e4eb26..c596db9a3cad3d58e19aee65cf6a0307cb8cdf31 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| @@ -29,6 +29,7 @@
|
| #include "cc/surfaces/surface.h"
|
| #include "cc/surfaces/surface_manager.h"
|
| #include "components/display_compositor/gl_helper.h"
|
| +#include "components/display_compositor/host_shared_bitmap_manager.h"
|
| #include "content/browser/browser_thread_impl.h"
|
| #include "content/browser/compositor/test/no_transport_image_transport_factory.h"
|
| #include "content/browser/frame_host/render_widget_host_view_guest.h"
|
| @@ -47,7 +48,6 @@
|
| #include "content/browser/renderer_host/resize_lock.h"
|
| #include "content/browser/renderer_host/text_input_manager.h"
|
| #include "content/browser/web_contents/web_contents_view_aura.h"
|
| -#include "content/common/host_shared_bitmap_manager.h"
|
| #include "content/common/input/synthetic_web_input_event_builders.h"
|
| #include "content/common/input_messages.h"
|
| #include "content/common/text_input_state.h"
|
| @@ -2267,7 +2267,8 @@ TEST_F(RenderWidgetHostViewAuraTest, DiscardDelegatedFrames) {
|
| size_t renderer_count = max_renderer_frames + 1;
|
| gfx::Rect view_rect(100, 100);
|
| gfx::Size frame_size = view_rect.size();
|
| - DCHECK_EQ(0u, HostSharedBitmapManager::current()->AllocatedBitmapCount());
|
| + DCHECK_EQ(0u, display_compositor::HostSharedBitmapManager::current()
|
| + ->AllocatedBitmapCount());
|
|
|
| std::unique_ptr<RenderWidgetHostImpl* []> hosts(
|
| new RenderWidgetHostImpl*[renderer_count]);
|
| @@ -2398,8 +2399,8 @@ TEST_F(RenderWidgetHostViewAuraTest, DiscardDelegatedFrames) {
|
| int handles_per_frame = 5;
|
| RendererFrameManager::GetInstance()->set_max_handles(handles_per_frame * 2);
|
|
|
| - HostSharedBitmapManagerClient bitmap_client(
|
| - HostSharedBitmapManager::current());
|
| + display_compositor::HostSharedBitmapManagerClient bitmap_client(
|
| + display_compositor::HostSharedBitmapManager::current());
|
|
|
| for (size_t i = 0; i < (renderer_count - 1) * handles_per_frame; i++) {
|
| bitmap_client.ChildAllocatedSharedBitmap(
|
| @@ -2432,7 +2433,8 @@ TEST_F(RenderWidgetHostViewAuraTest, DiscardDelegatedFramesWithLocking) {
|
| size_t renderer_count = max_renderer_frames + 1;
|
| gfx::Rect view_rect(100, 100);
|
| gfx::Size frame_size = view_rect.size();
|
| - DCHECK_EQ(0u, HostSharedBitmapManager::current()->AllocatedBitmapCount());
|
| + DCHECK_EQ(0u, display_compositor::HostSharedBitmapManager::current()
|
| + ->AllocatedBitmapCount());
|
|
|
| std::unique_ptr<RenderWidgetHostImpl* []> hosts(
|
| new RenderWidgetHostImpl*[renderer_count]);
|
| @@ -2503,7 +2505,8 @@ TEST_F(RenderWidgetHostViewAuraTest, DiscardDelegatedFramesWithMemoryPressure) {
|
| size_t renderer_count = kMaxRendererFrames;
|
| gfx::Rect view_rect(100, 100);
|
| gfx::Size frame_size = view_rect.size();
|
| - DCHECK_EQ(0u, HostSharedBitmapManager::current()->AllocatedBitmapCount());
|
| + DCHECK_EQ(0u, display_compositor::HostSharedBitmapManager::current()
|
| + ->AllocatedBitmapCount());
|
|
|
| std::unique_ptr<RenderWidgetHostImpl* []> hosts(
|
| new RenderWidgetHostImpl*[renderer_count]);
|
|
|