patch from chinmaygarde@ to make progress on mac, ios.

I've taken https://github.com/chinmaygarde/sky_engine/commit/ad591c629a295936206dcfde37f63c8c82bc2838
and merged it onto Chromium ToT, with a few lint and other cleanups,
and one fix to make sure that Mac still compiled (which may have broken
iOS, haven't tested yet).

R=brettw@chromium.org, sdfresne@chromium.org
BUG=459705
CQ_EXTRA_TRYBOTS=tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg

Review URL: https://codereview.chromium.org/1250913002

Cr-Commit-Position: refs/heads/master@{#342297}

4 files changed, 31 insertions, 17 deletions

diff --git a/base/BUILD.gn b/base/BUILD.gn
index da16ec3..b8ae3a9 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -11,6 +11,11 @@ if (is_android) {
 
 config("base_implementation") {
   defines = [ "BASE_IMPLEMENTATION" ]
+
+  if (is_ios) {
+    # base uses routines deprecated in iOS 8
+    cflags = [ "-Wno-deprecated-declarations" ]
+  }
 }
 
 if (is_win) {
@@ -643,7 +648,6 @@ component("base") {
   ]
 
   if (is_ios) {
-    sources += [ "process/memory_stubs.cc" ]
     sources -= [
       "message_loop/message_pump_libevent.cc",
       "message_loop/message_pump_libevent.h",
@@ -1339,7 +1343,6 @@ test("base_unittests") {
     "process/process_metrics_unittest_ios.cc",
     "process/process_unittest.cc",
     "process/process_util_unittest.cc",
-    "process/process_util_unittest_ios.cc",
     "profiler/stack_sampling_profiler_unittest.cc",
     "profiler/tracked_time_unittest.cc",
     "rand_util_unittest.cc",
@@ -1466,6 +1469,8 @@ test("base_unittests") {
 
   if (is_ios) {
     sources -= [
+      "memory/discardable_shared_memory_unittest.cc",
+      "memory/shared_memory_unittest.cc",
       "process/memory_unittest.cc",
       "process/process_unittest.cc",
       "process/process_util_unittest.cc",
@@ -1479,7 +1484,7 @@ test("base_unittests") {
       "mac/foundation_util_unittest.mm",
       "mac/objc_property_releaser_unittest.mm",
       "mac/scoped_nsobject_unittest.mm",
-      "sys_string_conversions_mac_unittest.mm",
+      "strings/sys_string_conversions_mac_unittest.mm",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
 
@@ -1500,7 +1505,7 @@ test("base_unittests") {
     sources -= [ "message_loop/message_pump_glib_unittest.cc" ]
   }
 
-  if (is_posix || is_ios) {
+  if (is_posix && !is_ios) {
     sources += [ "message_loop/message_pump_libevent_unittest.cc" ]
     deps += [ "//third_party/libevent" ]
   }
diff --git a/base/memory/BUILD.gn b/base/memory/BUILD.gn
index abbfa64..93e464c 100644
--- a/base/memory/BUILD.gn
+++ b/base/memory/BUILD.gn
@@ -47,7 +47,10 @@ source_set("memory") {
     "weak_ptr.h",
   ]
   if (is_ios) {
-    sources -= [ "shared_memory_posix.cc" ]
+    sources -= [
+      "discardable_shared_memory.cc",
+      "shared_memory_posix.cc",
+    ]
   }
 
   if (is_nacl) {
diff --git a/base/process/BUILD.gn b/base/process/BUILD.gn
index 3978b2e..2023162 100644
--- a/base/process/BUILD.gn
+++ b/base/process/BUILD.gn
@@ -96,7 +96,10 @@ source_set("process") {
   }
 
   if (is_ios) {
-    sources += [ "process_metrics.cc" ]
+    sources += [
+      "memory_stubs.cc",
+      "process_metrics.cc",
+    ]
   }
 
   configs += [ "//base:base_implementation" ]
diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn
index c36d266..3239915 100644
--- a/base/test/BUILD.gn
+++ b/base/test/BUILD.gn
@@ -37,15 +37,11 @@ source_set("test_support") {
     "histogram_tester.h",
     "ios/wait_util.h",
     "ios/wait_util.mm",
-    "launcher/test_launcher.cc",
     "launcher/test_launcher.h",
     "launcher/test_result.cc",
     "launcher/test_result.h",
-    "launcher/test_results_tracker.cc",
     "launcher/test_results_tracker.h",
-    "launcher/unit_test_launcher.cc",
     "launcher/unit_test_launcher.h",
-    "launcher/unit_test_launcher_ios.cc",
     "mock_chrome_application_mac.h",
     "mock_chrome_application_mac.mm",
     "mock_devices_changed_observer.cc",
@@ -54,9 +50,7 @@ source_set("test_support") {
     "mock_entropy_provider.h",
     "mock_log.cc",
     "mock_log.h",
-    "multiprocess_test.cc",
     "multiprocess_test.h",
-    "multiprocess_test_android.cc",
     "null_task_runner.cc",
     "null_task_runner.h",
     "opaque_ref_counted.cc",
@@ -126,6 +120,18 @@ source_set("test_support") {
     "values_test_util.h",
   ]
 
+  if (is_ios) {
+    sources += [ "launcher/unit_test_launcher_ios.cc" ]
+  } else {
+    sources += [
+      "launcher/test_launcher.cc",
+      "launcher/test_results_tracker.cc",
+      "launcher/unit_test_launcher.cc",
+      "multiprocess_test.cc",
+      "multiprocess_test_android.cc",
+    ]
+  }
+
   configs += [ "//build/config:precompiled_headers" ]
 
   data = [
@@ -154,14 +160,11 @@ source_set("test_support") {
       "scoped_locale.h",
     ]
   }
-  if (is_ios) {
-    # iOS uses its own unit test launcher.
-    sources -= [ "launcher/unit_test_launcher.cc" ]
 
-    # Pull in specific Mac files for iOS (which have been filtered out
-    # by file name rules).
+  if (is_ios) {
     set_sources_assignment_filter([])
     sources += [ "test_file_util_mac.cc" ]
+    set_sources_assignment_filter(sources_assignment_filter)
   }
 
   if (is_android) {