Make TestPlugin allocate its bitmap with SharedBitmapManager

This paves the way for having TextureMailbox use SharedBitmaps instead of SharedMemory.

Review URL: https://codereview.chromium.org/783573003

Cr-Commit-Position: refs/heads/master@{#307150}

2 files changed, 8 insertions, 0 deletions

diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc
index 96bce94..766008d 100644
--- a/content/public/test/mock_render_thread.cc
+++ b/content/public/test/mock_render_thread.cc
@@ -146,6 +146,10 @@ scoped_ptr<base::SharedMemory>
   return scoped_ptr<base::SharedMemory>(shared_buf.release());
 }
 
+cc::SharedBitmapManager* MockRenderThread::GetSharedBitmapManager() {
+  return &shared_bitmap_manager_;
+}
+
 void MockRenderThread::RegisterExtension(v8::Extension* extension) {
   blink::WebScriptController::registerExtension(extension);
 }
diff --git a/content/public/test/mock_render_thread.h b/content/public/test/mock_render_thread.h
index 719fb10..245fb04 100644
--- a/content/public/test/mock_render_thread.h
+++ b/content/public/test/mock_render_thread.h
@@ -8,6 +8,7 @@
 #include "base/memory/shared_memory.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
+#include "cc/test/test_shared_bitmap_manager.h"
 #include "content/public/renderer/render_thread.h"
 #include "ipc/ipc_test_sink.h"
 #include "ipc/message_filter.h"
@@ -56,6 +57,7 @@ class MockRenderThread : public RenderThread {
   void RecordComputedAction(const std::string& action) override;
   scoped_ptr<base::SharedMemory> HostAllocateSharedMemoryBuffer(
       size_t buffer_size) override;
+  cc::SharedBitmapManager* GetSharedBitmapManager() override;
   void RegisterExtension(v8::Extension* extension) override;
   void ScheduleIdleHandler(int64 initial_delay_ms) override;
   void IdleHandler() override;
@@ -162,6 +164,8 @@ class MockRenderThread : public RenderThread {
 
   // Observers to notify.
   ObserverList<RenderProcessObserver> observers_;
+
+  cc::TestSharedBitmapManager shared_bitmap_manager_;
 };
 
 }  // namespace content