Revert of 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 9aa5aca104661fc75a73d155763eb6c476da9e13..26eca00f3ba8f59a0d5409a14a6d46dd82d8efb6 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -173,10 +173,6 @@
     "//gpu/command_buffer/service",
     "//gpu/ipc/client",
     "//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",
@@ -230,6 +226,8 @@
 
   if (is_mac) {
     sources += [
+                 "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,6 +258,11 @@
   }
 
   if (is_android) {
+    sources += [
+      "gpu/gpu_memory_buffer_factory_surface_texture.cc",
+      "gpu/gpu_memory_buffer_factory_surface_texture.h",
+    ]
+
     deps += [
       "//content/public/android:common_aidl",
       "//content/public/android:jni",
@@ -281,6 +284,8 @@
     sources -= [
       "cursors/webcursor_ozone.cc",
       "font_list_ozone.cc",
+      "gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc",
+      "gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h",
     ]
   }
 
@@ -301,6 +306,17 @@
     }
   } else {
     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) {