Remove iOS conditions in content/ build files.

Remove iOS conditions in content/ build files.

Committed: https://crrev.com/b3c1195df1762b7df387dd114fa668a40dcf93c3
Cr-Commit-Position: refs/heads/master@{#382377}

[jam, 2016-03-21 17:25:47]

jam@chromium.org changed reviewers:
+ brettw@chromium.org

[brettw, 2016-03-21 18:12:18]

lgtm

[jam, 2016-03-21 18:22:51]

The CQ bit was checked by jam@chromium.org

[commit-bot: I haz the power, 2016-03-21 18:23:19]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1824653002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1824653002/1

[commit-bot: I haz the power, 2016-03-21 19:19:08]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-03-21 19:19:09]

Failed to apply patch for content/browser/BUILD.gn:
While running git apply --index -3 -p1;
  error: patch failed: content/browser/BUILD.gn:76
  Falling back to three-way merge...
  Applied patch to 'content/browser/BUILD.gn' with conflicts.
  U content/browser/BUILD.gn

Patch:       content/browser/BUILD.gn
Index: content/browser/BUILD.gn
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index
aea09ca4c6213eb5cb4106918313a5197ef1428b..f4789e982714f99b32b3a361e2889330a1db63ae
100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -15,33 +15,50 @@ source_set("browser") {
 
   configs += [
     "//build/config:precompiled_headers",
+    "//content:content_implementation",
     "//content/public/common:mojo_shell_client",
+    "//third_party/WebKit/public:debug_devtools",
+    "//v8:external_startup_data",
   ]
   defines = []
   libs = []
   ldflags = []
 
-  # Shared deps. See also non-iOS deps below.
   deps = [
     "//base",
     "//base:base_static",
+    "//cc",
+    "//cc/surfaces",
+    "//components/leveldb:lib",
     "//components/mime_util",
+    "//components/profile_service:lib",
+    "//components/scheduler:common",
     "//components/url_formatter",
     "//content:resources",
+    "//content/app/resources",
+    "//content/app/strings",
     "//content/browser/background_sync:background_sync_proto",
     "//content/browser/cache_storage:cache_storage_proto",
+    "//content/browser/devtools:gen_devtools_protocol_handler",
+    "//content/browser/devtools:resources",
     "//content/browser/notifications:notification_proto",
     "//content/browser/service_worker:service_worker_proto",
     "//content/browser/speech/proto",
+    "//content/common:mojo_bindings",
     "//content/gpu:gpu_sources",
     "//content/public/common:common_sources",
     "//content/public/common:mojo_bindings",
     "//crypto",
     "//device/battery",
+    "//device/bluetooth",
     "//device/vibration",
+    "//gin",
     "//google_apis",
     "//mojo/common",
+    "//mojo/common:url_type_converters",
+    "//mojo/converters/geometry",
     "//mojo/public/cpp/bindings",
+    "//mojo/public/js",
     "//mojo/shell",
     "//mojo/shell/public/cpp:cpp_for_chromium",
     "//mojo/shell/public/interfaces",
@@ -50,9 +67,23 @@ source_set("browser") {
     "//net",
     "//net:extras",
     "//skia",
+    "//skia/public",
     "//sql",
+    "//storage/browser",
+    "//storage/common",
+
+    # TODO(brettw) bug 582206: Blink should not be used in the browser
+    # process. This is required by devtools' input_handler.cc which calls
+    # WebKeyboardEvent::setKeyIdentifierFromWindowsKeyCode
+    "//third_party/WebKit/public:blink",
     "//third_party/WebKit/public:blink_headers",
+    "//third_party/WebKit/public:image_resources",
+    "//third_party/WebKit/public:resources",
+    "//third_party/angle:commit_id",
+    "//third_party/icu",
     "//third_party/kasko:kasko_features",
+    "//third_party/leveldatabase",
+    "//third_party/libyuv",
     "//third_party/npapi",
     "//third_party/re2",
     "//third_party/zlib",
@@ -63,12 +94,15 @@ source_set("browser") {
     "//ui/base/ime",
     "//ui/events",
     "//ui/events:gesture_detection",
+    "//ui/events/blink",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gl",
     "//ui/native_theme",
     "//ui/resources",
     "//ui/snapshot",
+    "//ui/surface",
+    "//ui/touch_selection",
   ]
 
   data_deps = [
@@ -76,93 +110,26 @@ source_set("browser") {
     ":chrome_renderer_manifest",
   ]
 
-  if (is_ios) {
-    # iOS doesn't get the normal file list and only takes these whitelisted
-    # files.
-    sources = [
-      "browser_context.cc",
-      "browser_main_loop.cc",
-      "browser_main_runner.cc",
-      "browser_process_sub_thread.cc",
-      "browser_thread_impl.cc",
-      "browser_url_handler_impl.cc",
-      "cert_store_impl.cc",
-      "download/download_create_info.cc",
-      "notification_service_impl.cc",
-      "signed_certificate_timestamp_store_impl.cc",
-      "user_metrics.cc",
-      "web_contents/navigation_entry_impl.cc",
-    ]
-  } else {
-    # Normal non-iOS sources get everything.
-    sources = rebase_path(content_browser_gypi_values.private_browser_sources,
-                          ".",
-                          "//content")
-
-    # TODO(GYP) these generated files are listed as sources in content_browser.
-    # This is a bit suspicious. The GN grit template will make a source set
-    # containing the generated code so it should be sufficient to just depend
-    # on the grit rule. But maybe some of these will need to be added?
-    #
-    # Need this annoying rebase_path call to match what happened with the
-    # sources.
-    sources -= rebase_path(
-            [
-              "$root_gen_dir/blink/grit/devtools_resources.h",
-              "$root_gen_dir/blink/grit/devtools_resources_map.cc",
-              "$root_gen_dir/blink/grit/devtools_resources_map.h",
-              "$root_gen_dir/content/browser/tracing/grit/tracing_resources.h",
-              "$root_gen_dir/ui/resources/grit/webui_resources_map.cc",
-            ],
-            ".")
-
-    # Non-iOS deps.
-    deps += [
-      "//cc",
-      "//cc/surfaces",
-      "//components/leveldb:lib",
-      "//components/profile_service:lib",
-      "//components/scheduler:common",
-      "//content/app/resources",
-      "//content/app/strings",
-      "//content/browser/devtools:gen_devtools_protocol_handler",
-      "//content/browser/devtools:resources",
-      "//content/common:mojo_bindings",
-      "//content/public/common:mojo_bindings",
-      "//device/bluetooth",
-      "//gin",
-      "//mojo/common:url_type_converters",
-      "//mojo/converters/geometry",
-      "//mojo/public/cpp/bindings",
-      "//mojo/public/js",
-      "//mojo/shell/public/interfaces",
-      "//skia/public",
-      "//storage/browser",
-      "//storage/common",
-
-      # TODO(brettw) bug 582206: Blink should not be used in the browser
-      # process. This is required by devtools' input_handler.cc which calls
-      # WebKeyboardEvent::setKeyIdentifierFromWindowsKeyCode
-      "//third_party/WebKit/public:blink",
-      "//third_party/WebKit/public:image_resources",
-      "//third_party/WebKit/public:resources",
-      "//third_party/angle:commit_id",
-      "//third_party/icu",
-      "//third_party/leveldatabase",
-      "//third_party/libyuv",
-      "//ui/events/blink",
-      "//ui/resources",
-      "//ui/surface",
-      "//ui/touch_selection",
-    ]
-
-    configs += [ "//v8:external_startup_data" ]
-  }
-
-  configs += [
-    "//content:content_implementation",
-    "//third_party/WebKit/public:debug_devtools",
-  ]
+  sources = rebase_path(content_browser_gypi_values.private_browser_sources,
+                        ".",
+                        "//content")
+
+  # TODO(GYP) these generated files are listed as sources in content_browser.
+  # This is a bit suspicious. The GN grit template will make a source set
+  # containing the generated code so it should be sufficient to just depend
+  # on the grit rule. But maybe some of these will need to be added?
+  #
+  # Need this annoying rebase_path call to match what happened with the
+  # sources.
+  sources -= rebase_path(
+          [
+            "$root_gen_dir/blink/grit/devtools_resources.h",
+            "$root_gen_dir/blink/grit/devtools_resources_map.cc",
+            "$root_gen_dir/blink/grit/devtools_resources_map.h",
+            "$root_gen_dir/content/browser/tracing/grit/tracing_resources.h",
+            "$root_gen_dir/ui/resources/grit/webui_resources_map.cc",
+          ],
+          ".")
 
   if (toolkit_views) {
     deps += [ "//ui/events" ]
@@ -190,10 +157,10 @@ source_set("browser") {
   #       '../third_party/WebKit/public/blink.gyp:blink',
   #     ],
   #   }],
-  if (!is_mac && !is_ios) {
+  if (!is_mac) {
     deps += [ "//sandbox" ]
   }
-  if (!is_android && !is_ios) {
+  if (!is_android) {
     deps += [ "//content/browser/tracing:resources" ]
   }
   if ((use_udev && is_posix) || is_mac || is_win) {

[jam, 2016-03-21 19:40:49]

The CQ bit was checked by jam@chromium.org

[jam, 2016-03-21 19:40:50]

The patchset sent to the CQ was uploaded after l-g-t-m from brettw@chromium.org
Link to the patchset: https://codereview.chromium.org/1824653002/#ps20001
(title: "merge")

[commit-bot: I haz the power, 2016-03-21 19:41:18]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1824653002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1824653002/20001

[commit-bot: I haz the power, 2016-03-21 20:41:41]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-03-21 20:43:51]

Description was changed from

==========
Remove iOS conditions in content/ build files.
==========

to

==========
Remove iOS conditions in content/ build files.

Committed: https://crrev.com/b3c1195df1762b7df387dd114fa668a40dcf93c3
Cr-Commit-Position: refs/heads/master@{#382377}
==========

[commit-bot: I haz the power, 2016-03-21 20:43:52]

Patchset 2 (id:??) landed as
https://crrev.com/b3c1195df1762b7df387dd114fa668a40dcf93c3
Cr-Commit-Position: refs/heads/master@{#382377}