Make more of content pass "gn check"

Adds dependencies and makes some deps public so more of content passes include checking. This adds 25 targets. CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1817903002 Cr-Commit-Position: refs/heads/master@{#382430}
feiyue1206 · Mar 21, 2016 · c15ed73 · c15ed73
1 parent 9f060d4
commit c15ed73
Show file tree

Hide file tree

Showing 16 changed files with 85 additions and 21 deletions.
diff --git a/.gn b/.gn
@@ -36,8 +36,7 @@ check_targets = [
   "//components/*",
 
   #"//content/*",  # A whole lot of errors.
-  "//content/public/common:result_codes",
-  "//content/public/common:static_switches",
+  "//content/public/*",
   "//content/renderer/*",
   "//courgette/*",
   "//crypto/*",

diff --git a/cc/surfaces/BUILD.gn b/cc/surfaces/BUILD.gn
@@ -45,8 +45,10 @@ component("surfaces") {
 
   defines = [ "CC_SURFACES_IMPLEMENTATION=1" ]
 
-  deps = [
+  public_deps = [
     ":surface_id",
+  ]
+  deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
     "//cc",

diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
@@ -27,13 +27,16 @@ source_set("browser") {
   deps = [
     "//base",
     "//base:base_static",
+    "//base/third_party/dynamic_annotations",
     "//cc",
     "//cc/surfaces",
     "//components/filesystem:lib",
     "//components/leveldb:lib",
     "//components/mime_util",
     "//components/profile_service:lib",
     "//components/scheduler:common",
+    "//components/tracing",
+    "//components/tracing:startup_tracing",
     "//components/url_formatter",
     "//content:resources",
     "//content/app/resources",
@@ -55,9 +58,15 @@ source_set("browser") {
     "//device/vibration",
     "//gin",
     "//google_apis",
+    "//gpu",
+    "//gpu/command_buffer/client:gles2_implementation",
+    "//ipc/mojo",
+    "//media",
+    "//media/midi",
     "//mojo/common",
     "//mojo/common:url_type_converters",
     "//mojo/converters/geometry",
+    "//mojo/converters/network",
     "//mojo/public/cpp/bindings",
     "//mojo/public/js",
     "//mojo/shell",
@@ -87,6 +96,9 @@ source_set("browser") {
     "//third_party/libyuv",
     "//third_party/npapi",
     "//third_party/re2",
+    "//third_party/webrtc",
+    "//third_party/webrtc/base:rtc_base",
+    "//third_party/webrtc/modules/desktop_capture:primitives",
     "//third_party/zlib",
     "//third_party/zlib:zip",
     "//ui/accessibility",
@@ -101,6 +113,7 @@ source_set("browser") {
     "//ui/gl",
     "//ui/native_theme",
     "//ui/resources",
+    "//ui/shell_dialogs",
     "//ui/snapshot",
     "//ui/surface",
     "//ui/touch_selection",

diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
@@ -186,6 +186,7 @@ source_set("common") {
     "//third_party/boringssl",
     "//third_party/icu",
     "//third_party/libjingle",
+    "//third_party/webrtc/base:rtc_base",
     "//ui/accessibility",
     "//ui/base",
     "//ui/base/ime",

diff --git a/content/public/app/BUILD.gn b/content/public/app/BUILD.gn
@@ -36,6 +36,10 @@ public_app_shared_deps = [
   "//base:i18n",
   "//content:export",
   "//content/public/common:common_sources",
+  "//content/public/gpu:gpu_sources",
+  "//content/public/plugin:plugin_sources",
+  "//content/public/renderer:renderer_sources",
+  "//content/public/utility:utility_sources",
 ]
 
 if (is_component_build) {

diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn
@@ -25,10 +25,6 @@ source_set("browser_sources") {
                         ".",
                         "//content")
 
-  if (use_aura) {
-    sources -= [ "context_factory.h" ]
-  }
-
   configs += [
     "//build/config:precompiled_headers",
     "//content:content_implementation",
@@ -43,17 +39,33 @@ source_set("browser_sources") {
     "//skia",
   ]
   deps = [
+    "//cc",
     "//content/browser",
     "//content/public/common:common_sources",
+    "//gpu",
+    "//media",
     "//net",
+    "//ppapi/c",
+    "//storage/browser",
     "//ui/accessibility",
     "//ui/base",
     "//ui/events",
+    "//ui/gl",
+    "//ui/surface",
   ]
 
   allow_circular_includes_from = [
     # This target is a pair with content/browser. They always go together and
     # include headers from each other.
     "//content/browser",
   ]
+
+  if (is_android) {
+    deps += [ "//ui/android" ]
+  }
+
+  if (use_aura) {
+    sources -= [ "context_factory.h" ]
+    deps += [ "//ui/aura" ]
+  }
 }
diff --git a/content/public/browser/desktop_media_id.cc b/content/public/browser/desktop_media_id.cc
@@ -16,8 +16,8 @@
 #include "base/strings/string_util.h"
 
 #if defined(USE_AURA)
-#include "ui/aura/window.h"
-#include "ui/aura/window_observer.h"
+#include "ui/aura/window.h"  // nogncheck
+#include "ui/aura/window_observer.h"  // nogncheck
 #endif  // defined(USE_AURA)
 
 namespace  {

diff --git a/content/public/child/BUILD.gn b/content/public/child/BUILD.gn
@@ -38,5 +38,6 @@ source_set("child_sources") {
 
   deps = [
     "//content/public/common:common_sources",
+    "//gin",
   ]
 }
diff --git a/content/public/common/BUILD.gn b/content/public/common/BUILD.gn
@@ -36,7 +36,13 @@ source_set("content_descriptors") {
   sources = [
     "content_descriptors.h",
   ]
+
+  # The header uses V8_USE_EXTERNAL_STARTUP_DATA.
   public_configs = [ "//v8:external_startup_data" ]
+
+  deps = [
+    "//ipc",
+  ]
 }
 
 # Forces static linking for targets using the static_switches constants, even
@@ -91,14 +97,26 @@ source_set("common_sources") {
     "//url/ipc:url_ipc",
   ]
   deps = [
+    "//ipc",
+    "//ipc/mojo",
+    "//media",
+    "//mojo/common",
     "//net",
+    "//ppapi/c",
     "//skia",
+    "//storage/common",
     "//third_party/WebKit/public:blink_headers",
     "//third_party/icu",
+    "//ui/accessibility",
     "//ui/base",
     "//ui/gfx",
+    "//ui/gfx/ipc",
+    "//ui/surface",
   ]
 
+  # //content/common needs to include public headers.
+  allow_circular_includes_from = [ "//content/common" ]
+
   if (!enable_plugins) {
     sources -= [
       "pepper_plugin_info.cc",
@@ -132,6 +150,7 @@ buildflag_header("features") {
 source_set("feature_h264_with_openh264_ffmpeg") {
   deps = [
     ":features",
+    "//base",
   ]
   sources = [
     "feature_h264_with_openh264_ffmpeg.cc",

diff --git a/content/public/gpu/BUILD.gn b/content/public/gpu/BUILD.gn
@@ -26,5 +26,6 @@ source_set("gpu_sources") {
     "//base",
     "//content:export",
     "//content/gpu:gpu_sources",
+    "//content/public/common:common_sources",
   ]
 }
diff --git a/content/public/renderer/BUILD.gn b/content/public/renderer/BUILD.gn
@@ -28,12 +28,19 @@ source_set("renderer_sources") {
   configs += [ "//content:content_implementation" ]
 
   deps = [
+    "//content/public/child:child_sources",
     "//content/public/common:common_sources",
     "//content/renderer",
+    "//gin",
+    "//media",
+    "//net",
+    "//ppapi/c",
     "//skia",
     "//third_party/WebKit/public:blink_headers",
     "//third_party/libjingle",
     "//third_party/widevine/cdm:version_h",
+    "//ui/base",
+    "//ui/base/ime",
     "//ui/gfx",
     "//v8",
   ]

diff --git a/content/public/utility/BUILD.gn b/content/public/utility/BUILD.gn
@@ -29,6 +29,7 @@ source_set("utility_sources") {
   deps = [
     "//base",
     "//content:export",
+    "//content/public/child:child_sources",
     "//content/public/common:common_sources",
     "//content/utility",
     "//ipc",

diff --git a/gpu/command_buffer/client/BUILD.gn b/gpu/command_buffer/client/BUILD.gn
@@ -58,10 +58,12 @@ source_set("client_sources") {
 
   all_dependent_configs = [ "//third_party/khronos:khronos_headers" ]
 
-  deps = [
+  public_deps = [
     "//base",
-    "//gpu/command_buffer/common:common_sources",
     "//gpu/command_buffer/common:gles2_utils",
+  ]
+  deps = [
+    "//gpu/command_buffer/common:common_sources",
     "//ui/gfx:memory_buffer",
     "//ui/gfx/geometry",
   ]

diff --git a/storage/browser/BUILD.gn b/storage/browser/BUILD.gn
@@ -188,13 +188,15 @@ component("browser") {
     "//build/config/compiler:wexit_time_destructors",
   ]
 
+  public_deps = [
+    "//storage/common",
+  ]
   deps = [
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
     "//net",
     "//sql",
-    "//storage/common",
     "//third_party/leveldatabase",
     "//third_party/sqlite",
     "//url",

diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn
@@ -63,12 +63,12 @@ component("events_base") {
   defines = [ "EVENTS_BASE_IMPLEMENTATION" ]
 
   deps = [
-    ":dom_keycode_converter",
     "//base/third_party/dynamic_annotations",
     "//skia",
   ]
 
   public_deps = [
+    ":dom_keycode_converter",
     "//base",
     "//ui/events/platform",
     "//ui/gfx",

diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
@@ -259,6 +259,14 @@ component("gfx") {
   # This is part of the gfx component in the component build.
   defines = [ "GFX_IMPLEMENTATION" ]
 
+  public_deps = [
+    ":memory_buffer_sources",
+    ":native_widget_types",
+    "//base",
+    "//skia",
+    "//third_party/icu",
+    "//ui/gfx/geometry",
+  ]
   deps = [
     ":gfx_export",
     "//base",
@@ -269,14 +277,6 @@ component("gfx") {
     "//third_party/harfbuzz-ng",
     "//third_party/libpng",
     "//third_party/zlib",
-    "//ui/gfx/geometry",
-  ]
-  public_deps = [
-    ":memory_buffer_sources",
-    ":native_widget_types",
-    "//base",
-    "//skia",
-    "//third_party/icu",
   ]
 
   # Text rendering conditions (complicated so separated out).