Revert of Revert of content: Fix single process support for native GpuMemoryBuffers.

content/gpu/in_process_gpu_thread.h

Index: content/gpu/in_process_gpu_thread.h
diff --git a/content/gpu/in_process_gpu_thread.h b/content/gpu/in_process_gpu_thread.h
index 67ba017c54dcf01444c282303c44d4882882e6f1..37167303fd128d3d4fc96d436eb29395040770f0 100644
--- a/content/gpu/in_process_gpu_thread.h
+++ b/content/gpu/in_process_gpu_thread.h
@@ -7,11 +7,11 @@
 
 #include "base/threading/thread.h"
 #include "content/common/content_export.h"
-#include "content/common/content_export.h"
 #include "content/common/in_process_child_thread_params.h"
 
 namespace content {
 
+class GpuMemoryBufferFactory;
 class GpuProcess;
 
 // This class creates a GPU thread (instead of a GPU process), when running
@@ -31,6 +31,8 @@
   // Deleted in CleanUp() on the gpu thread, so don't use smart pointers.
   GpuProcess* gpu_process_;
 
+  scoped_ptr<GpuMemoryBufferFactory> gpu_memory_buffer_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(InProcessGpuThread);
 };