gpu: Refactor memory buffer handling code out of content.

content/browser/gpu/browser_gpu_memory_buffer_manager.h

Index: content/browser/gpu/browser_gpu_memory_buffer_manager.h
diff --git a/content/browser/gpu/browser_gpu_memory_buffer_manager.h b/content/browser/gpu/browser_gpu_memory_buffer_manager.h
index 87166e22babbe3db79499cfb060b7bf7b9b04d3f..23ab6bd7ce3ae874a92a3d0cd30b2cba9ef3e027 100644
--- a/content/browser/gpu/browser_gpu_memory_buffer_manager.h
+++ b/content/browser/gpu/browser_gpu_memory_buffer_manager.h
@@ -18,6 +18,7 @@
 #include "base/trace_event/memory_dump_provider.h"
 #include "content/common/content_export.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
+#include "gpu/ipc/client/gpu_host_memory_buffer_manager.h"
 #include "gpu/ipc/common/surface_handle.h"
 
 namespace content {
@@ -169,14 +170,18 @@ class CONTENT_EXPORT BrowserGpuMemoryBufferManager
   const int gpu_client_id_;
   const uint64_t gpu_client_tracing_id_;
 
+  std::unique_ptr<gpu::GpuHostMemoryBufferManager> gpu_memory_buffer_manager_;
+
   // The GPU process host ID. This should only be accessed on the IO thread.
   int gpu_host_id_;
 
+#if 1
   // Stores info about buffers for all clients. This should only be accessed
   // on the IO thread.
   using BufferMap = base::hash_map<gfx::GpuMemoryBufferId, BufferInfo>;
   using ClientMap = base::hash_map<int, BufferMap>;
   ClientMap clients_;
+#endif
 
   DISALLOW_COPY_AND_ASSIGN(BrowserGpuMemoryBufferManager);
 };