Make ui gn check pass. Misc GN build improvements.

chrome/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/features.gni")
 import("//build/config/locales.gni")
 import("//build/config/ui.gni")
 import("//chrome/chrome_repack_locales.gni")
 import("//chrome/version.gni")
 
@@ skipping 40 matching lines @@
 
     deps += [
       # On Linux, link the dependencies (libraries) that make up actual
       # Chromium functionality directly into the executable.
       ":browser_dependencies",
       ":child_dependencies",
 
       "//base/allocator",
       # Needed to use the master_preferences functions
       "//chrome/installer/util",
-      "//content/app:both",
+      "//content/public/app:both",
     ]
 
     # Needed for chrome_main.cc initialization of libraries.
     configs += [ "//build/config/linux:pangocairo" ]
 
     # TODO(GYP) ['profiling==0 and linux_disable_pie==0', {
     #   'ldflags': [
     #      '-pie',
     #   ],
     #}],
@@ skipping 433 matching lines @@
 
 # GYP version: chrome/chrome_resources.gyp:chrome_strings
 group("strings") {
   deps = [
     "//chrome/app:chromium_strings",
     "//chrome/app:generated_resources",
     "//chrome/app:google_chrome_strings",
     "//chrome/app/resources:locale_settings",
   ]
 }