Fix GN linking issues.

content/common/BUILD.gn

Index: content/common/BUILD.gn
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index af0334bfb8539f08c68e83ce3c3a94df07842398..fa71c12e7ac85607159bec37af87a943dfeaf522 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -36,6 +36,7 @@ source_set("common") {
     "//ui/base",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/gfx/ipc",
     "//ui/shell_dialogs",
     "//url",
     "//third_party/WebKit/public:blink_headers",
@@ -56,17 +57,16 @@ source_set("common") {
       "//gpu/command_buffer/client:gles2_implementation",
       "//gpu/command_buffer/service",
       "//gpu/ipc",
+      "//gpu/skia_bindings",
+      "//media",
+      "//media:shared_memory_support",
       "//mojo/public/interfaces/service_provider",
+      "//third_party/WebKit/public:blink",
       "//ui/gl",
       "//webkit/browser:storage",
       "//webkit/common",
       "//webkit/common:storage",
       "//webkit/common/gpu",
-      #'../gpu/gpu.gyp:gl_in_process_context',
-      #'../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
-      #'../media/media.gyp:media',
-      #'../media/media.gyp:shared_memory_support',
-      #'../third_party/WebKit/public/blink.gyp:blink',
     ]
   }
 
@@ -150,6 +150,10 @@ source_set("common") {
   }
 
   if (use_x11) {
+    sources += [
+      "gpu/gpu_memory_buffer_factory_x11_pixmap.cc",
+      "common/gpu/gpu_memory_buffer_factory_x11_pixmap.h",
+    ]
     include_dirs += [ "//third_party/khronos" ]
     configs += [ "//build/config/linux:xcomposite" ]
 
@@ -178,10 +182,6 @@ source_set("common") {
       "gpu/media/android_video_decode_accelerator.cc",
       "gpu/media/android_video_decode_accelerator.h",
     ]
-    deps += [
-      # TODO(GYP) enable once supported in the GN build.
-      #"//media",
-    ]
 
     if (enable_webrtc) {
       deps += [ "//third_party/libyuv" ]
@@ -204,8 +204,6 @@ source_set("common") {
         "gpu/media/v4l2_video_encode_accelerator.cc",
         "gpu/media/v4l2_video_encode_accelerator.h",
       ]
-      # TODO(GYP) enable once supported in the GN build.
-      #deps += [ "//media" ]
       libs = [ "EGL", "GLESv2" ]
     } else {  # !arm
       sources += [
@@ -230,8 +228,6 @@ source_set("common") {
     ]
     include_dirs += [ "//third_party/khronos" ]
     deps += [
-      # TODO(GYP) enable once supported in the GN build.
-      #"//media",
       "//ui/gl",
     ]