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

base/test/BUILD.gn

Index: base/test/BUILD.gn
diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn
index 39eea78bd395888931b490008d3bab5021c74bbf..4a3bd995fd660cf083a893a601d0bcb0bc7a00fb 100644
--- a/base/test/BUILD.gn
+++ b/base/test/BUILD.gn
@@ -35,15 +35,11 @@ source_set("test_support") {
     "gtest_xml_util.h",
     "histogram_tester.cc",
     "histogram_tester.h",
-    "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",
@@ -52,9 +48,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",
@@ -124,6 +118,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 = [
@@ -152,12 +158,8 @@ 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" ]
   }