gpu: Have GpuService create and own GpuMemoryBufferFactory.

content/gpu/in_process_gpu_thread.cc

Index: content/gpu/in_process_gpu_thread.cc
diff --git a/content/gpu/in_process_gpu_thread.cc b/content/gpu/in_process_gpu_thread.cc
index f92d9cb3dcb43ff76ea87330bd59d05ff32c63cb..b6e465199dc4e80ab6413d1e7064f0d90c641e60 100644
--- a/content/gpu/in_process_gpu_thread.cc
+++ b/content/gpu/in_process_gpu_thread.cc
@@ -10,8 +10,6 @@
 #include "content/gpu/gpu_process.h"
 #include "gpu/config/gpu_info_collector.h"
 #include "gpu/config/gpu_util.h"
-#include "gpu/ipc/common/gpu_memory_buffer_support.h"
-#include "gpu/ipc/service/gpu_memory_buffer_factory.h"
 #include "ui/gl/init/gl_factory.h"
 
 #if defined(OS_ANDROID)
@@ -24,17 +22,10 @@
 
 namespace content {
 
-InProcessGpuThread::InProcessGpuThread(
-    const InProcessChildThreadParams& params,
-    const gpu::GpuPreferences& gpu_preferences)
+InProcessGpuThread::InProcessGpuThread(const InProcessChildThreadParams& params)
     : base::Thread("Chrome_InProcGpuThread"),
       params_(params),
-      gpu_process_(NULL),
-      gpu_preferences_(gpu_preferences),
-      gpu_memory_buffer_factory_(
-          gpu::GetNativeGpuMemoryBufferType() != gfx::EMPTY_BUFFER
-          ? gpu::GpuMemoryBufferFactory::CreateNativeType()
-          : nullptr) {}
+      gpu_process_(NULL) {}
 
 InProcessGpuThread::~InProcessGpuThread() {
   Stop();
@@ -72,8 +63,8 @@ void InProcessGpuThread::Init() {
 
   // The process object takes ownership of the thread object, so do not
   // save and delete the pointer.
-  GpuChildThread* child_thread = new GpuChildThread(
-      params_, gpu_info, gpu_feature_info, gpu_memory_buffer_factory_.get());
+  GpuChildThread* child_thread =
+      new GpuChildThread(params_, gpu_info, gpu_feature_info);
 
   // Since we are in the browser process, use the thread start time as the
   // process start time.
@@ -88,9 +79,8 @@ void InProcessGpuThread::CleanUp() {
 }
 
 base::Thread* CreateInProcessGpuThread(
-    const InProcessChildThreadParams& params,
-    const gpu::GpuPreferences& gpu_preferences) {
-  return new InProcessGpuThread(params, gpu_preferences);
+    const InProcessChildThreadParams& params) {
+  return new InProcessGpuThread(params);
 }
 
 }  // namespace content