Fix most chrome/browser/ui "gn check" problems.

chrome/browser/ui/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/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/split_static_library.gni")
 import("//chrome/common/features.gni")
 import("//media/media_options.gni")
@@ skipping 42 matching lines @@
     "//components/sync",
     "//content/public/browser",
   ]
   deps = [
     # NOTE: New dependencies should generally be added in the OS!="ios"
     # dependencies block below, rather than here.
     "//base",
     "//chrome:extra_resources",
     "//chrome:resources",
     "//chrome:strings",
+    "//chrome/app:command_ids",
     "//chrome/app/resources:platform_locale_settings",
     "//chrome/app/theme:theme_resources",
     "//chrome/common",
     "//components/app_modal",
     "//components/autofill/core/browser",
     "//components/bookmarks/browser",
+    "//components/bookmarks/managed",
     "//components/browser_sync/browser",
     "//components/certificate_reporting:cert_logger_proto",
     "//components/certificate_reporting:encrypted_cert_logger_proto",
+    "//components/content_settings/content/common",
     "//components/content_settings/core/browser",
+    "//components/crash/content/app",
+    "//components/crx_file",
     "//components/data_reduction_proxy/core/browser",
     "//components/device_event_log",
     "//components/dom_distiller/content/browser",
     "//components/dom_distiller/webui",
     "//components/domain_reliability",
     "//components/favicon/content",
     "//components/favicon/core",
     "//components/feedback",
     "//components/flags_ui",
     "//components/gcm_driver",
     "//components/google/core/browser",
     "//components/guest_view/browser",
-    "//components/history/core/browser",
+    "//components/history/content/browser",
     "//components/infobars/core",
     "//components/invalidation/impl",
     "//components/keyed_service/content",
     "//components/keyed_service/core",
     "//components/metrics:profiler",
     "//components/mime_util",
+    "//components/ntp_snippets",
+    "//components/ntp_tiles",
+    "//components/offline_pages",
+    "//components/offline_pages/background:background_offliner",
     "//components/omnibox/browser",
     "//components/onc",
     "//components/password_manager/content/browser",
     "//components/password_manager/core/browser",
+    "//components/password_manager/sync/browser",
     "//components/pdf/browser",
     "//components/policy:generated",
     "//components/pref_registry",
     "//components/proximity_auth",
     "//components/proxy_config",
     "//components/query_parser",
     "//components/rappor",
     "//components/renderer_context_menu",
     "//components/resources",
+    "//components/safe_json",
     "//components/search",
     "//components/search_engines",
     "//components/security_interstitials/core",
     "//components/security_state",
+    "//components/sessions",
     "//components/signin/core/account_id",
     "//components/signin/core/browser",
+    "//components/spellcheck/browser",
     "//components/ssl_errors",
     "//components/startup_metric_utils/browser:lib",
     "//components/strings",
+    "//components/subresource_filter/content/browser",
+    "//components/supervised_user_error_page",
     "//components/sync",
     "//components/sync_sessions",
+    "//components/syncable_prefs",
     "//components/toolbar",
-    "//components/translate/core/browser",
+    "//components/tracing:startup_tracing",
+    "//components/translate/content/browser",
+    "//components/undo",
     "//components/update_client",
     "//components/upload_list",
+    "//components/user_manager",
     "//components/user_prefs",
+    "//components/variations",
+    "//components/variations/service",
     "//components/version_ui",
+    "//components/web_cache/browser",
     "//components/web_resource",
     "//components/zoom",
+    "//content/app/resources",
     "//content/public/common",
     "//crypto",
     "//device/core",
+    "//device/usb",
     "//services/shell/runner/common",
     "//skia",
     "//third_party/cacheinvalidation",
+    "//third_party/cld:cld_version",
     "//third_party/icu",
     "//third_party/zlib",
     "//ui/accessibility",
     "//ui/base",
     "//ui/content_accelerators",
     "//ui/display",
     "//ui/events",
     "//ui/events:gesture_detection",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/message_center",
     "//ui/native_theme",
     "//ui/resources",
     "//ui/shell_dialogs",
     "//ui/snapshot",
     "//ui/strings",
   ]
+  allow_circular_includes_from = []
 
   if (enable_extensions) {
-    deps += [ "//extensions/browser" ]
+    deps += [
+      "//components/drive",
+      "//extensions/browser",
+    ]
   }
 
   if (is_chromeos && use_cras) {
     defines += [ "USE_CRAS" ]
   }
 
   if (!is_ios) {
     sources += rebase_path(gypi_values.chrome_browser_ui_non_ios_sources,
                            ".",
                            "//chrome")
     sources += rebase_path(gypi_values.chrome_browser_ui_toolbar_model_sources,
                            ".",
                            "//chrome")
     deps += [
       "//chrome/browser/devtools",
-      "//chrome/browser/ui/views",
       "//chrome/browser/ui/webui/engagement:mojo_bindings",
       "//chrome/browser/ui/webui/omnibox:mojo_bindings",
       "//chrome/browser/ui/webui/plugins:mojo_bindings",
       "//chrome/browser/ui/webui/usb_internals:mojo_bindings",
       "//chrome/common/net",
       "//chrome/installer/util:with_no_strings",
       "//components/autofill/content/browser:risk_proto",
+      "//components/browsing_data/core",
       "//components/browsing_data_ui",
       "//components/bubble:bubble",
       "//components/crash/core/browser",
       "//components/net_log",
       "//components/power",
       "//components/suggestions/proto",
       "//components/url_formatter",
       "//device/nfc",
       "//media",
       "//net:net_with_v8",
       "//net:stale_while_revalidate_experiment_domains",
       "//storage/browser",
       "//storage/common",
       "//third_party/WebKit/public:resources",
       "//third_party/adobe/flash:flapper_version_h",
       "//third_party/brotli",
       "//third_party/leveldatabase",
       "//third_party/libjingle",
       "//third_party/re2",
+      "//ui/base",
       "//ui/base/ime",
       "//ui/compositor",
       "//ui/surface",
       "//ui/web_dialogs",
       "//v8",
     ]
   } else {
     # iOS.
     sources +=
         rebase_path(gypi_values.chrome_browser_ui_ios_sources, ".", "//chrome")
     deps += [ "//net" ]
   }
 
   if (!android_java_ui && !is_ios) {
     sources += rebase_path(gypi_values.chrome_browser_ui_non_mobile_sources,
                            ".",
                            "//chrome")
     sources +=
         rebase_path(gypi_values.chrome_browser_ui_omnibox_non_mobile_sources,
                     ".",
                     "//chrome")
     deps += [
+      "//apps",
       "//chrome/browser/profile_resetter:profile_reset_report_proto",
       "//chrome/common:features",
       "//components/feedback/proto",
       "//components/proximity_auth/webui",
       "//device/bluetooth",
     ]
   }
 
   if (enable_basic_printing || enable_print_preview) {
     deps += [ "//printing" ]
   }
 
   if (enable_nacl) {
     sources +=
         rebase_path(gypi_values.chrome_browser_ui_nacl_sources, ".", "//chrome")
-    deps += [ "//native_client/src/trusted/service_runtime:sel" ]
+    deps += [ "//components/nacl/browser" ]
   }
   if (enable_plugins) {
     sources += rebase_path(gypi_values.chrome_browser_ui_plugin_sources,
                            ".",
                            "//chrome")
     deps += [ "//ppapi/proxy:ipc" ]
   }
   if (safe_browsing_mode == 1) {
     deps += [
       "//chrome/browser/safe_browsing:chunk_proto",
@@ skipping 49 matching lines @@
     ]
   } else {  # Not ash.
     sources += rebase_path(gypi_values.chrome_browser_ui_non_ash_sources,
                            ".",
                            "//chrome")
   }
   if (toolkit_views) {
     sources += rebase_path(gypi_values.chrome_browser_ui_views_sources,
                            ".",
                            "//chrome")
-    deps += [ "//components/constrained_window" ]
+    deps += [
+      "//chrome/browser/ui/views",
+      "//components/constrained_window",
+      "//services/ui/public/cpp/input_devices",
+    ]
+    allow_circular_includes_from += [ "//chrome/browser/ui/views" ]
 
     if (enable_extensions) {
       deps += [ "//extensions/components/native_app_window" ]
     }
 
     if (is_chromeos) {
       sources +=
           rebase_path(gypi_values.chrome_browser_ui_views_chromeos_sources,
                       ".",
                       "//chrome")
@@ skipping 14 matching lines @@
           "//services/ui/public/interfaces",
         ]
 
         # TODO(erg): These files hard depend on mus, and thus can't be in a gyp
         # build. When gyp goes away, merge this back into the sources list.
         sources += [
           "views/tabs/window_finder_mus.cc",
           "views/tabs/window_finder_mus.h",
         ]
       }
+      deps += [ "//ui/views/mus" ]
+
       if (enable_extensions) {
         sources += rebase_path(
                 gypi_values.chrome_browser_ui_views_extensions_non_mac_sources,
                 ".",
                 "//chrome")
       }
     }
     if (use_ash) {
       sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources,
                              ".",
                              "//chrome")
     }
-  } else {
-    # !toolkit_views
-    if (!is_ios) {
-      deps -= [ "//chrome/browser/ui/views" ]
-    }
   }
   if (use_gio) {
     deps += [ "//build/linux/libgio" ]
   }
   if (use_aura && !use_ozone && is_desktop_linux) {
     deps += [
       # gtk2 is the only component that can interact with gtk2 in our new
       # world.
       "//chrome/browser/ui/libgtk2ui",
     ]
@@ skipping 47 matching lines @@
   if (!enable_themes) {
     sources -= [ "webui/theme_source.cc" ]
   }
   if (enable_print_preview) {
     sources += rebase_path(gypi_values.chrome_browser_ui_print_preview_sources,
                            ".",
                            "//chrome")
   }
 
   if (is_android) {
-    deps += [ "//crypto:platform" ]
+    deps += [
+      "//components/navigation_interception",
+      "//crypto:platform",
+      "//device/usb/mojo",
+      "//device/usb/public/interfaces",
+      "//ui/android",
+    ]
 
     if (android_java_ui) {
       sources +=
           rebase_path(gypi_values.chrome_browser_ui_android_java_ui_sources,
                       ".",
                       "//chrome")
       deps += [
         "//chrome/browser:jni_headers",
         "//components/web_contents_delegate_android",
       ]
       deps -= [ "//ui/events" ]
     }
+  } else {
+    sources += [ "browser_window.h" ]

[sky, 2016/08/26 20:10:25]

ICK! I suspect this is a bug that android is including this file...

[brettw, 2016/08/26 20:14:31]

Yes, there is a lot of win.

   }
 
   if (is_mac) {
     sources +=
         rebase_path(gypi_values.chrome_browser_ui_mac_sources, ".", "//chrome")
     deps += [
       ":generate_localizer",
       "//third_party/apple_sample_code",
       "//third_party/google_toolbox_for_mac",
       "//third_party/molokocacao",
@@ skipping 53 matching lines @@
       "//ui/events:dom_keycode_converter",
     ]
     if (!is_chrome_branded) {
       deps -= [ "//google_update" ]
       sources -= [ "webui/help/version_updater_win.cc" ]
       sources += [
         "webui/help/version_updater_basic.cc",
         "webui/help/version_updater_basic.h",
       ]
     }
-    if (enable_app_list) {
-      deps += [ "//ui/app_list" ]
-    }
   } else {  # 'OS!="win"
     if (toolkit_views) {
       public_deps += [
         "//ui/views",
         "//ui/views/controls/webview",
       ]
     }
   }
   if (is_desktop_linux) {
     sources += rebase_path(gypi_values.chrome_browser_ui_desktop_linux_sources,
@@ skipping 12 matching lines @@
       deps += [ "//build/linux:fontconfig" ]
       if (use_dbus) {
         deps += [ "//dbus" ]
       }
     }
     if (use_x11) {
       sources += rebase_path(gypi_values.chrome_browser_ui_x11_sources,
                              ".",
                              "//chrome")
       configs += [ "//build/config/linux:x11" ]
-      deps += [ "//ui/events/devices" ]
+      deps += [
+        "//ui/events/devices",
+        "//ui/events/devices/x11",
+      ]
       if (is_chromeos) {
         sources -= [ "views/tabs/window_finder_x11.cc" ]
       }
     }
   }
 
   if (use_udev) {
     deps += [ "//device/udev_linux" ]
   }
 
@@ skipping 29 matching lines @@
       "//third_party/libaddressinput",
       "//third_party/libaddressinput:strings",
     ]
   }
   if (enable_extensions) {
     deps += [
       "//chrome/browser/extensions",
       "//chrome/common/extensions/api",
       "//chrome/common/extensions/api:api_registration",
     ]
-    allow_circular_includes_from = [ "//chrome/browser/extensions" ]
+    allow_circular_includes_from += [ "//chrome/browser/extensions" ]
     sources += rebase_path(gypi_values.chrome_browser_ui_extensions_sources,
                            ".",
                            "//chrome")
   }
   if (enable_google_now && !is_android) {
     sources += rebase_path(
             gypi_values.chrome_browser_ui_google_now_non_android_sources,
             ".",
             "//chrome")
   }
   if (enable_media_router && !is_android && !is_ios) {
     sources += rebase_path(gypi_values.chrome_browser_ui_media_router_sources,
                            ".",
                            "//chrome")
     if (is_mac && !mac_views_browser) {
       sources -= [
         # This file is compiled on GYP but never referenced on Mac. Since it's
         # in a static library, it never gets pulled in and we never try to link
         # it (it doesn't link). In GN, source sets force us to get this rule
         # correct.
         "views/toolbar/media_router_action_platform_delegate_views.cc",
         "views/toolbar/media_router_action_platform_delegate_views.h",
       ]
     }
-    deps += [ "//chrome/browser/media/router" ]
+    deps += [
+      "//chrome/browser/media/router",
+      "//components/web_modal",
+    ]
   }
   if (enable_webrtc) {
     sources += rebase_path(gypi_values.chrome_browser_ui_webrtc_sources,
                            ".",
                            "//chrome")
   }
   if (enable_service_discovery) {
     sources +=
         rebase_path(gypi_values.chrome_browser_ui_service_discovery_sources,
                     ".",
@@ skipping 19 matching lines @@
                        root_build_dir,
                        "//chrome")
   }
 }
 
 # In GYP this is part of test_support_common.
 static_library("test_support") {
   testonly = true
 
   sources = [
-    "browser.h",
     "cocoa/cocoa_test_helper.h",
     "cocoa/cocoa_test_helper.mm",
     "cocoa/run_loop_testing.h",
     "cocoa/run_loop_testing.mm",
     "exclusive_access/fullscreen_controller_state_test.cc",
     "exclusive_access/fullscreen_controller_state_test.h",
     "exclusive_access/fullscreen_controller_state_tests.h",
     "exclusive_access/fullscreen_controller_test.cc",
     "exclusive_access/fullscreen_controller_test.h",
     "find_bar/find_bar_host_unittest_util.h",
     "login/login_handler_test_utils.cc",
     "login/login_handler_test_utils.h",
     "test/test_confirm_bubble_model.cc",
     "test/test_confirm_bubble_model.h",
     "toolbar/test_toolbar_action_view_controller.cc",
     "toolbar/test_toolbar_action_view_controller.h",
   ]
-
-  if (!is_ios && !is_android) {
-    sources += [
-      "passwords/manage_passwords_ui_controller_mock.cc",
-      "passwords/manage_passwords_ui_controller_mock.h",
-      "passwords/password_dialog_controller_mock.cc",
-      "passwords/password_dialog_controller_mock.h",
-      "passwords/passwords_model_delegate_mock.cc",
-      "passwords/passwords_model_delegate_mock.h",
-    ]
-  }
+  public_deps = [
+    ":ui",
+  ]
+  deps = [
+    "//chrome/app/theme:theme_resources",
+    "//chrome/browser",
+    "//chrome/browser/devtools",
+    "//components/password_manager/core/browser",
+    "//components/sessions",
+    "//components/toolbar",
+    "//components/translate/content/browser",
+    "//components/zoom",
+    "//content/public/browser",
+    "//content/public/common",
+    "//content/test:test_support",
+    "//net:test_support",
+    "//skia",
+    "//testing/gtest",
+    "//ui/base",
+    "//ui/shell_dialogs",
+  ]
 
   if (toolkit_views && (!is_mac || mac_views_browser)) {
     sources += [
       "views/find_bar_host_unittest_util_views.cc",
       "views/toolbar/browser_action_test_util_views.cc",
     ]
+    deps += [ "//ui/aura" ]
   } else {
     sources += [
       "cocoa/extensions/browser_action_test_util_mac.mm",
       "cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm",
     ]
   }
 
   if (is_android) {
     sources -= [
       "exclusive_access/fullscreen_controller_state_test.cc",
       "exclusive_access/fullscreen_controller_state_test.h",
       "exclusive_access/fullscreen_controller_state_tests.h",
       "exclusive_access/fullscreen_controller_test.cc",
       "exclusive_access/fullscreen_controller_test.h",
       "test/test_confirm_bubble_model.cc",
       "test/test_confirm_bubble_model.h",
     ]
+  } else {
+    sources += [
+      "passwords/manage_passwords_ui_controller_mock.cc",
+      "passwords/manage_passwords_ui_controller_mock.h",
+      "passwords/password_dialog_controller_mock.cc",
+      "passwords/password_dialog_controller_mock.h",
+      "passwords/passwords_model_delegate_mock.cc",
+      "passwords/passwords_model_delegate_mock.h",
+    ]
+    deps += [ "//chrome/test:test_support_ui" ]
   }
 
-  public_deps = [
-    ":ui",
-  ]
-  deps = [
-    "//chrome/app/theme:theme_resources",
-    "//chrome/browser",
-    "//content/public/browser",
-    "//content/public/common",
-    "//content/test:test_support",
-    "//net:test_support",
-    "//skia",
-    "//testing/gtest",
-    "//ui/base",
-  ]
+  if (enable_extensions) {
+    deps += [ "//extensions/browser" ]
+  }
 }