Remove is_ios conditions from chrome GN build files.

The //chrome directory is no longer used by the iOS build so these conditionals
are all dead build code.

Review-Url: https://codereview.chromium.org/2282573002
Cr-Commit-Position: refs/heads/master@{#414838}

chrome/BUILD.gn

@@ -1196,20 +1196,16 @@ group("browser_dependencies") {
 # GYP version: chromium_child_dependencies variable in chrome.gyp
 group("child_dependencies") {
   public_deps = [
+    "//chrome/browser/devtools",
+    "//chrome/child",
     "//chrome/common",
+    "//chrome/gpu",
+    "//chrome/renderer",
+    "//chrome/utility",
     "//components/sync",
+    "//content/public/child",
+    "//third_party/WebKit/public:blink_devtools_frontend_resources",
   ]
-  if (!is_ios) {
-    public_deps += [
-      "//chrome/browser/devtools",
-      "//chrome/child",
-      "//chrome/gpu",
-      "//chrome/renderer",
-      "//chrome/utility",
-      "//content/public/child",
-      "//third_party/WebKit/public:blink_devtools_frontend_resources",
-    ]
-  }
 
   if (enable_nacl) {
     public_deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ]
@@ -1305,19 +1301,15 @@ group("resources") {
 # GYP version: chrome/chrome_resources.gyp:chrome_extra_resources
 group("extra_resources") {
   public_deps = [
+    "//chrome/browser/resources:component_extension_resources",
     "//chrome/browser/resources:invalidations_resources",
     "//chrome/browser/resources:net_internals_resources",
+    "//chrome/browser/resources:options_resources",
     "//chrome/browser/resources:password_manager_internals_resources",
     "//chrome/browser/resources:policy_resources",
+    "//chrome/browser/resources:settings_resources",
     "//chrome/browser/resources:translate_internals_resources",
   ]
-  if (!is_ios) {
-    public_deps += [
-      "//chrome/browser/resources:component_extension_resources",
-      "//chrome/browser/resources:options_resources",
-      "//chrome/browser/resources:settings_resources",
-    ]
-  }
 
   if (is_chromeos) {
     public_deps += [ "//chrome/browser/resources/chromeos/chromevox" ]
@@ -1389,6 +1381,7 @@ group("packed_resources") {
 repack("packed_extra_resources") {
   visibility = [ "./*" ]
   sources = [
+    "$root_gen_dir/blink/public/resources/blink_resources.pak",
     "$root_gen_dir/chrome/browser_resources.pak",
     "$root_gen_dir/chrome/chrome_unscaled_resources.pak",
     "$root_gen_dir/chrome/common_resources.pak",
@@ -1398,6 +1391,8 @@ repack("packed_extra_resources") {
     "$root_gen_dir/chrome/policy_resources.pak",
     "$root_gen_dir/chrome/translate_internals_resources.pak",
     "$root_gen_dir/components/components_resources.pak",
+    "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
+    "$root_gen_dir/content/content_resources.pak",
     "$root_gen_dir/net/net_resources.pak",
     "$root_gen_dir/ui/resources/webui_resources.pak",
   ]
@@ -1411,15 +1406,17 @@ repack("packed_extra_resources") {
     "//chrome/browser/resources:translate_internals_resources",
     "//chrome/common:resources",
     "//components/resources",
+    "//content:resources",
+    "//content/browser/tracing:resources",
     "//net:net_resources",
+    "//third_party/WebKit/public:resources",
     "//ui/resources",
   ]
 
   if (is_android) {
     sources += [ "$root_gen_dir/android_webview/aw_resources.pak" ]
     deps += [ "//android_webview:generate_aw_resources" ]
-  }
-  if (!is_ios && !is_android) {
+  } else {  # Non-Android.
     # New paks should be added here by default.
     sources += [
       "$root_gen_dir/blink/devtools_resources.pak",
@@ -1438,18 +1435,6 @@ repack("packed_extra_resources") {
       "//content/browser/devtools:devtools_resources",
     ]
   }
-  if (!is_ios) {
-    sources += [
-      "$root_gen_dir/blink/public/resources/blink_resources.pak",
-      "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
-      "$root_gen_dir/content/content_resources.pak",
-    ]
-    deps += [
-      "//content:resources",
-      "//content/browser/tracing:resources",
-      "//third_party/WebKit/public:resources",
-    ]
-  }
   if (is_chromeos) {
     sources += [ "$root_gen_dir/ui/file_manager/file_manager_resources.pak" ]
     deps += [ "//ui/file_manager:resources" ]
@@ -1462,10 +1447,7 @@ repack("packed_extra_resources") {
     deps += [ "//extensions:extensions_resources" ]
   }
 
-  # GYP outputs the file in the gen/repack directory. On non-Mac/iOS platforms
-  # it them copies it. This skipes the copy step and writes it to the final
-  # location.
-  if (is_mac || is_ios) {
+  if (is_mac) {
     output = "$root_gen_dir/repack/resources.pak"
   } else {
     output = "$root_out_dir/resources.pak"
@@ -1541,9 +1523,11 @@ template("chrome_repack_percent") {
 
     # All sources should also have deps for completeness.
     sources = [
+      "$root_gen_dir/blink/public/resources/blink_image_resources_${percent}_percent.pak",
       "$root_gen_dir/chrome/renderer_resources_${percent}_percent.pak",
       "$root_gen_dir/chrome/theme_resources_${percent}_percent.pak",
       "$root_gen_dir/components/components_resources_${percent}_percent.pak",
+      "$root_gen_dir/content/app/resources/content_resources_${percent}_percent.pak",
       "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak",
     ]
 
@@ -1552,20 +1536,12 @@ template("chrome_repack_percent") {
       "//chrome/renderer:resources",
       "//components/resources",
       "//components/strings",
+      "//content/app/resources",
       "//net:net_resources",
+      "//third_party/WebKit/public:image_resources",
       "//ui/resources",
     ]
 
-    if (!is_ios) {
-      sources += [
-        "$root_gen_dir/blink/public/resources/blink_image_resources_${percent}_percent.pak",
-        "$root_gen_dir/content/app/resources/content_resources_${percent}_percent.pak",
-      ]
-      deps += [
-        "//content/app/resources",
-        "//third_party/WebKit/public:image_resources",
-      ]
-    }
     if (use_ash) {
       sources +=
           [ "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak" ]

chrome/browser/ui/BUILD.gn

@@ -32,7 +32,12 @@ split_static_library("ui") {
     split_count = 1
   }
 
-  sources = []
+  sources = rebase_path(gypi_values.chrome_browser_ui_non_ios_sources,
+                        ".",
+                        "//chrome")
+  sources += rebase_path(gypi_values.chrome_browser_ui_toolbar_model_sources,
+                         ".",
+                         "//chrome")
   defines = []
   libs = []
 
@@ -63,17 +68,29 @@ split_static_library("ui") {
     "//chrome/app:command_ids",
     "//chrome/app/resources:platform_locale_settings",
     "//chrome/app/theme:theme_resources",
+    "//chrome/browser/devtools",
+    "//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",
+    "//chrome/common/net",
+    "//chrome/installer/util:with_no_strings",
     "//components/app_modal",
+    "//components/autofill/content/browser:risk_proto",
     "//components/autofill/core/browser",
     "//components/bookmarks/browser",
     "//components/bookmarks/managed",
     "//components/browser_sync/browser",
+    "//components/browsing_data/core",
+    "//components/browsing_data_ui",
+    "//components/bubble:bubble",
     "//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/crash/core/browser",
     "//components/crx_file",
     "//components/data_reduction_proxy/core/browser",
     "//components/device_event_log",
@@ -94,6 +111,7 @@ split_static_library("ui") {
     "//components/keyed_service/core",
     "//components/metrics:profiler",
     "//components/mime_util",
+    "//components/net_log",
     "//components/ntp_snippets",
     "//components/ntp_tiles",
     "//components/offline_pages",
@@ -105,6 +123,7 @@ split_static_library("ui") {
     "//components/password_manager/sync/browser",
     "//components/pdf/browser",
     "//components/policy:generated",
+    "//components/power",
     "//components/pref_registry",
     "//components/proximity_auth",
     "//components/proxy_config",
@@ -125,6 +144,7 @@ split_static_library("ui") {
     "//components/startup_metric_utils/browser:lib",
     "//components/strings",
     "//components/subresource_filter/content/browser",
+    "//components/suggestions/proto",
     "//components/supervised_user_error_page",
     "//components/sync",
     "//components/sync_sessions",
@@ -135,6 +155,7 @@ split_static_library("ui") {
     "//components/undo",
     "//components/update_client",
     "//components/upload_list",
+    "//components/url_formatter",
     "//components/user_manager",
     "//components/user_prefs",
     "//components/variations",
@@ -147,15 +168,30 @@ split_static_library("ui") {
     "//content/public/common",
     "//crypto",
     "//device/core",
+    "//device/nfc",
     "//device/usb",
+    "//media",
+    "//net:net_with_v8",
+    "//net:stale_while_revalidate_experiment_domains",
     "//services/shell/runner/common",
     "//skia",
+    "//storage/browser",
+    "//storage/common",
+    "//third_party/WebKit/public:resources",
+    "//third_party/adobe/flash:flapper_version_h",
+    "//third_party/brotli",
     "//third_party/cacheinvalidation",
     "//third_party/cld:cld_version",
     "//third_party/icu",
+    "//third_party/leveldatabase",
+    "//third_party/libjingle",
+    "//third_party/re2",
     "//third_party/zlib",
     "//ui/accessibility",
     "//ui/base",
+    "//ui/base",
+    "//ui/base/ime",
+    "//ui/compositor",
     "//ui/content_accelerators",
     "//ui/display",
     "//ui/events",
@@ -168,6 +204,9 @@ split_static_library("ui") {
     "//ui/shell_dialogs",
     "//ui/snapshot",
     "//ui/strings",
+    "//ui/surface",
+    "//ui/web_dialogs",
+    "//v8",
   ]
   allow_circular_includes_from = []
 
@@ -182,57 +221,7 @@ split_static_library("ui") {
     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/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) {
+  if (!android_java_ui) {
     sources += rebase_path(gypi_values.chrome_browser_ui_non_mobile_sources,
                            ".",
                            "//chrome")
@@ -615,7 +604,7 @@ split_static_library("ui") {
                            ".",
                            "//chrome")
   }
-  if (!android_java_ui && !is_ios) {
+  if (!android_java_ui) {
     deps += [
       "//third_party/libaddressinput",
       "//third_party/libaddressinput:strings",
@@ -638,7 +627,7 @@ split_static_library("ui") {
             ".",
             "//chrome")
   }
-  if (enable_media_router && !is_android && !is_ios) {
+  if (enable_media_router && !is_android) {
     sources += rebase_path(gypi_values.chrome_browser_ui_media_router_sources,
                            ".",
                            "//chrome")

chrome/common/BUILD.gn

@@ -53,6 +53,7 @@ static_library("common") {
 
   public_deps = [
     ":features",
+    ":mojo_bindings",
     "//base:base",
     "//base:base_static",
     "//base:i18n",
@@ -60,9 +61,12 @@ static_library("common") {
     "//chrome:strings",
     "//chrome/app/theme:theme_resources",
     "//chrome/common:constants",
+    "//chrome/common/net",
     "//chrome/common/safe_browsing:proto",
     "//chrome/common/variations:fieldtrial_testing_config",
     "//chrome/installer/util:with_no_strings",
+    "//components/autofill/content/common",
+    "//components/autofill/core/common",
     "//components/cast_certificate",
     "//components/cdm/common",
     "//components/cloud_devices/common",
@@ -82,14 +86,19 @@ static_library("common") {
     "//components/nacl/common:switches",
     "//components/offline_pages:switches",
     "//components/omnibox/common",
+    "//components/password_manager/content/public/interfaces",
+    "//components/password_manager/core/common",
     "//components/policy:generated",
     "//components/policy/core/common",
     "//components/prefs",
+    "//components/signin/core/common",
     "//components/strings",
+    "//components/translate/content/common",
     "//components/translate/core/common",
     "//components/url_formatter",
     "//components/variations",
     "//components/version_info",
+    "//components/visitedlink/common",
     "//content/public/common",
     "//crypto",
     "//extensions/common:common_constants",
@@ -97,10 +106,15 @@ static_library("common") {
     "//google_apis",
     "//gpu/command_buffer/service",
     "//gpu/config",
+    "//ipc",
+    "//media",
+    "//mojo/public/cpp/bindings",
     "//net",
     "//skia",
     "//third_party/icu",
     "//third_party/kasko:kasko_features",
+    "//third_party/re2",
+    "//third_party/widevine/cdm:version_h",
     "//third_party/zlib:zip",
     "//ui/accessibility",
     "//ui/base",
@@ -117,35 +131,6 @@ static_library("common") {
     public_deps += [ "//ppapi/shared_impl" ]
   }
 
-  if (is_ios) {
-    sources += [
-      # Use this Mac file that was filtered out.
-      "channel_info_mac.mm",
-    ]
-    sources -= [
-      "resource_usage_reporter_type_converters.cc",
-      "resource_usage_reporter_type_converters.h",
-    ]
-  } else {
-    # Non-iOS.
-    public_deps += [
-      ":mojo_bindings",
-      "//chrome/common/net",
-      "//components/autofill/content/common",
-      "//components/autofill/core/common",
-      "//components/password_manager/content/public/interfaces",
-      "//components/password_manager/core/common",
-      "//components/signin/core/common",
-      "//components/translate/content/common",
-      "//components/visitedlink/common",
-      "//ipc",
-      "//media",
-      "//mojo/public/cpp/bindings",
-      "//third_party/re2",
-      "//third_party/widevine/cdm:version_h",
-    ]
-  }
-
   if (enable_extensions) {
     sources += rebase_path(gypi_values.chrome_common_extensions_sources,
                            ".",

chrome/renderer/BUILD.gn

@@ -34,9 +34,11 @@ static_library("renderer") {
     "//chrome:strings",
     "//chrome/common",
     "//chrome/common:mojo_bindings",
+    "//chrome/common/net",
     "//components/autofill/content/renderer",
     "//components/cdm/renderer",
     "//components/content_settings/content/common",
+    "//components/contextual_search:renderer",
     "//components/data_reduction_proxy/content/common",
     "//components/data_reduction_proxy/core/common",
     "//components/dom_distiller/content/renderer",
@@ -59,6 +61,7 @@ static_library("renderer") {
     "//content/app/strings",
     "//content/public/common",
     "//content/public/renderer",
+    "//media",
     "//net",
     "//skia",
     "//storage/common",
@@ -74,14 +77,6 @@ static_library("renderer") {
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
-  if (!is_ios) {
-    deps += [
-      "//chrome/common/net",
-      "//components/contextual_search:renderer",
-      "//media",
-    ]
-  }
-
   if (enable_nacl) {
     deps += [
       "//components/nacl/loader",