Some linking fixes for GN build.

BUILD.gn

 # Copyright (c) 2013 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.
 
 # This is the root build file for GN. GN will start processing by loading this
 # file, and recursively load all dependencies until all dependencies are either
 # resolved or known not to exist (which will cause the build to fail). So if
 # you add a new build file, there must be some path of dependencies from this
 # file to your new one or GN won't know about it.
 
@@ skipping 13 matching lines @@
     "//chrome/browser/devtools",
     "//chrome/browser/ui",
     "//chrome/browser/ui/views",
     "//chrome/common",
     "//chrome/plugin",
     "//chrome/renderer",
     "//chrome/service",
     "//chrome/utility",
     "//components:all_components",
     "//content",
+    "//content/shell:content_shell",
     "//crypto",
     "//device/bluetooth",
     "//device/nfc",
     "//device/usb",
     "//extensions/common",
     "//extensions/common/api",
     "//gin",
     "//gpu",
     "//google_apis",
     "//google_apis/gcm",
@@ skipping 79 matching lines @@
   }
 
   if (is_linux) {
     deps += [
       "//dbus",
       "//third_party/fontconfig",
       "//third_party/freetype2",
     ]
   }
 
+  if (use_x11) {
+    deps += [ "//tools/xdisplaycheck" ]
+  }
+
   if (is_win) {
     deps += [
       "//ui/metro_viewer",
     ]
   }
 
   if (is_win || is_mac || is_chromeos) {
     # RLZ works on these platforms.
     deps += [
       "//rlz:rlz_lib",
@@ skipping 15 matching lines @@
       "//chrome/browser",  # Blocked on content.
       "//chrome/browser/devtools",  # Blocked on content.
       "//chrome/browser/ui",  # Blocked on content.
       "//chrome/browser/ui/views",  # Blocked on content.
       "//chrome/common",  # Blocked on content.
       "//chrome/plugin",  # Blocked on content.
       "//chrome/renderer",  # Blocked on content.
       "//chrome/service",  # Blocked on content.
       "//chrome/utility",  # Blocked on content.
       "//content",
+      "//content/shell:content_shell",  # Blocked on content.
       "//extensions/common",
       "//extensions/common/api",
       "//pdf",  # Not compiled on Android in GYP yet, either.
       "//ppapi:ppapi_c",
       "//sandbox",
       "//third_party/libusb",
       "//ui/keyboard",  # Blocked on content.
 
       # Seems to not be compiled on Android. Otherwise it will need a config.h.
       "//third_party/libxslt",
@@ skipping 26 matching lines @@
     ]
   }
 
   if (use_ozone) {
     deps += [
       "//ui/events/ozone:events_ozone",
       "//ui/events/ozone:events_ozone_evdev",
     ]
   }
 }