Refactor content/common/gpu into gpu/ipc/service

content/common/BUILD.gn

Index: content/common/BUILD.gn
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index c8ed79372213aa80b38dc84c12b040c641e37613..d6e8cd796aace817449b07e27f09f9524d97bb60 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -172,6 +172,10 @@ source_set("common") {
     "//gpu/command_buffer/common:gles2_utils",
     "//gpu/command_buffer/service",
     "//gpu/ipc/common",
+
+    # TODO(markdittmer): This should be removed once content/common/gpu/media
+    # is refactored into media/ipc.
+    "//gpu/ipc/service",
     "//gpu/skia_bindings",
     "//ipc",
     "//ipc/mojo",
@@ -225,8 +229,6 @@ source_set("common") {
     sources += [
                  "gpu/client/gpu_memory_buffer_impl_io_surface.cc",
                  "gpu/client/gpu_memory_buffer_impl_io_surface.h",
-                 "gpu/gpu_memory_buffer_factory_io_surface.cc",
-                 "gpu/gpu_memory_buffer_factory_io_surface.h",
                  "gpu/media/vt_mac.h",
                  "gpu/media/vt_video_decode_accelerator_mac.cc",
                  "gpu/media/vt_video_decode_accelerator_mac.h",
@@ -260,8 +262,6 @@ source_set("common") {
     sources += [
       "gpu/client/gpu_memory_buffer_impl_surface_texture.cc",
       "gpu/client/gpu_memory_buffer_impl_surface_texture.h",
-      "gpu/gpu_memory_buffer_factory_surface_texture.cc",
-      "gpu/gpu_memory_buffer_factory_surface_texture.h",
     ]
 
     deps += [
@@ -287,8 +287,6 @@ source_set("common") {
       "font_list_ozone.cc",
       "gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc",
       "gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.h",
-      "gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc",
-      "gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h",
     ]
   }
 
@@ -311,17 +309,6 @@ source_set("common") {
     sources -= [ "font_list_pango.cc" ]
   }
 
-  if (use_x11) {
-    configs += [
-      "//build/config/linux:xcomposite",
-      "//third_party/khronos:khronos_headers",
-    ]
-
-    if (current_cpu != "arm" || !is_chromeos) {
-      sources += [ "gpu/x_util.h" ]
-    }
-  }
-
   if (enable_plugins) {
     deps += [ "//ppapi/shared_impl" ]
   } else {