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

content/gpu/gpu_child_thread.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_GPU_GPU_CHILD_THREAD_H_
 #define CONTENT_GPU_GPU_CHILD_THREAD_H_
 
 #include <queue>
 #include <string>
 
@@ skipping 26 matching lines @@
 class GpuChildThread : public ChildThreadImpl {
  public:
   typedef std::queue<IPC::Message*> DeferredMessages;
 
   GpuChildThread(GpuWatchdogThread* gpu_watchdog_thread,
                  bool dead_on_arrival,
                  const gpu::GPUInfo& gpu_info,
                  const DeferredMessages& deferred_messages,
                  GpuMemoryBufferFactory* gpu_memory_buffer_factory);
 
-  explicit GpuChildThread(const InProcessChildThreadParams& params);
+  GpuChildThread(const InProcessChildThreadParams& params,
+                 GpuMemoryBufferFactory* gpu_memory_buffer_factory);
 
   ~GpuChildThread() override;
 
+  static gfx::GpuMemoryBufferType GetGpuMemoryBufferFactoryType();
+
   void Shutdown() override;
 
   void Init(const base::Time& process_start_time);
   void StopWatchdog();
 
   // ChildThread overrides.
   bool Send(IPC::Message* msg) override;
   bool OnControlMessageReceived(const IPC::Message& msg) override;
 
  private:
@@ skipping 37 matching lines @@
 
   // The GpuMemoryBufferFactory instance used to allocate GpuMemoryBuffers.
   GpuMemoryBufferFactory* const gpu_memory_buffer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChildThread);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_GPU_GPU_CHILD_THREAD_H_