Make component_unittests run the same tests on GYP and GN on Android

BUG=510485
R=skyostil
TBR=sdefresne

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

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

7 files changed, 59 insertions, 48 deletions

diff --git a/components/BUILD.gn b/components/BUILD.gn
index 7dbcc52..6bb49d41c 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -307,9 +307,16 @@ test("components_unittests") {
     "//base",
     "//base/test:test_support",
     "//components/bookmarks/browser:unit_tests",
+    "//components/bookmarks/managed:unit_tests",
+    "//components/compression:unit_tests",
     "//components/content_settings/core/common",
+    "//components/data_usage/core:unit_tests",
+    "//components/data_use_measurement/content:unit_tests",
     "//components/google/core/browser:unit_tests",
+    "//components/net_log:unit_tests",
     "//components/search:unit_tests",
+    "//components/sessions:unit_tests",
+    "//components/syncable_prefs:unit_tests",
     "//components/undo:unit_tests",
     "//net",
     "//ui/base",
@@ -323,15 +330,19 @@ test("components_unittests") {
 
   if (!is_ios) {
     deps += [
+      "//components/certificate_transparency:unit_tests",
       "//components/enhanced_bookmarks:unit_tests",
       "//components/error_page/renderer:unit_tests",
       "//components/guest_view/browser:unit_tests",
       "//components/navigation_interception:unit_tests",
       "//components/network_hints/renderer:unit_tests",
+      "//components/page_load_metrics/browser:unit_tests",
+      "//components/page_load_metrics/renderer:unit_tests",
       "//components/power:unit_tests",
       "//components/safe_json:unit_tests",
       "//components/scheduler:unit_tests",
       "//components/test_runner:test_runner",
+      "//components/tracing:unit_tests",
       "//components/ui/zoom:unit_tests",
       "//components/visitedlink/test:unit_tests",
       "//components/web_cache/browser:unit_tests",
@@ -421,9 +432,7 @@ test("components_unittests") {
         "//components/copresence:unit_tests",
         "//components/feedback:unit_tests",
         "//components/proximity_auth:unit_tests",
-        "//components/sessions:unit_tests",
         "//components/storage_monitor:unit_tests",
-        "//components/tracing:unit_tests",
         "//components/webusb:unit_tests",
       ]
     }
@@ -440,14 +449,7 @@ test("components_unittests") {
       isolate_file = "components_unittests.isolate"
 
       deps += [ "//content/public/android:content_java" ]
-      deps -= [
-        "//components/gcm_driver:unit_tests",
-        "//components/gcm_driver/instance_id:unit_tests",
-        "//components/password_manager/content/browser:unit_tests",
-        "//components/password_manager/core/browser:unit_tests",
-        "//components/password_manager/core/common:unit_tests",
-        "//components/password_manager/sync/browser:unit_tests",
-      ]
+      deps -= [ "//components/gcm_driver/instance_id:unit_tests" ]
 
       apk_deps = [
         "//components/invalidation/impl:java",
diff --git a/components/data_use_measurement/content/BUILD.gn b/components/data_use_measurement/content/BUILD.gn
index 6c7a149..3f7c06e 100644
--- a/components/data_use_measurement/content/BUILD.gn
+++ b/components/data_use_measurement/content/BUILD.gn
@@ -14,7 +14,7 @@ source_set("content") {
     "//net",
   ]
 }
-source_set("data_use_measurement_unittests") {
+source_set("unit_tests") {
   sources = [
     "data_use_measurement_unittest.cc",
   ]
diff --git a/components/gcm_driver/BUILD.gn b/components/gcm_driver/BUILD.gn
index 111d97a..b009eac 100644
--- a/components/gcm_driver/BUILD.gn
+++ b/components/gcm_driver/BUILD.gn
@@ -125,24 +125,28 @@ source_set("test_support") {
   }
 }
 
-if (!is_android) {
-  source_set("unit_tests") {
-    testonly = true
-    sources = [
+source_set("unit_tests") {
+  testonly = true
+
+  sources = [
+    "gcm_account_tracker_unittest.cc",
+  ]
+
+  deps = [
+    ":gcm_driver",
+    ":test_support",
+    "//testing/gtest",
+    "//third_party/protobuf:protobuf_lite",
+  ]
+
+  if (!is_android) {
+    sources += [
       "gcm_account_mapper_unittest.cc",
-      "gcm_account_tracker_unittest.cc",
       "gcm_channel_status_request_unittest.cc",
       "gcm_client_impl_unittest.cc",
       "gcm_delayed_task_controller_unittest.cc",
       "gcm_driver_desktop_unittest.cc",
       "gcm_stats_recorder_impl_unittest.cc",
     ]
-
-    deps = [
-      ":gcm_driver",
-      ":test_support",
-      "//testing/gtest",
-      "//third_party/protobuf:protobuf_lite",
-    ]
   }
 }
diff --git a/components/metrics/BUILD.gn b/components/metrics/BUILD.gn
index e9af6d6..836c243 100644
--- a/components/metrics/BUILD.gn
+++ b/components/metrics/BUILD.gn
@@ -258,6 +258,8 @@ source_set("unit_tests") {
     "metrics_state_manager_unittest.cc",
     "net/net_metrics_log_uploader_unittest.cc",
     "persisted_logs_unittest.cc",
+    "profiler/profiler_metrics_provider_unittest.cc",
+    "profiler/tracking_synchronizer_unittest.cc",
     "stability_metrics_helper_unittest.cc",
     "ui/screen_info_metrics_provider_unittest.cc",
   ]
diff --git a/components/policy/core/common/BUILD.gn b/components/policy/core/common/BUILD.gn
index 0bdcae6..2da67c2 100644
--- a/components/policy/core/common/BUILD.gn
+++ b/components/policy/core/common/BUILD.gn
@@ -260,6 +260,10 @@ source_set("unit_tests") {
     ]
   }
 
+  if (is_android) {
+    sources -= [ "async_policy_provider_unittest.cc" ]
+  }
+
   if (is_android || is_ios) {
     sources -= [
       "cloud/component_cloud_policy_service_unittest.cc",
diff --git a/components/scheduler/BUILD.gn b/components/scheduler/BUILD.gn
index 8065258..4e43318 100644
--- a/components/scheduler/BUILD.gn
+++ b/components/scheduler/BUILD.gn
@@ -48,6 +48,7 @@ source_set("unit_tests") {
     "child/webthread_impl_for_worker_scheduler_unittest.cc",
     "child/worker_scheduler_impl_unittest.cc",
     "renderer/deadline_task_runner_unittest.cc",
+    "renderer/idle_time_estimator_unittest.cc",
     "renderer/render_widget_signals_unittest.cpp",
     "renderer/renderer_scheduler_impl_unittest.cc",
     "renderer/task_cost_estimator_unittest.cc",
diff --git a/components/sessions/BUILD.gn b/components/sessions/BUILD.gn
index 8d07d3b..370d12e 100644
--- a/components/sessions/BUILD.gn
+++ b/components/sessions/BUILD.gn
@@ -150,32 +150,30 @@ source_set("test_support") {
   }
 }
 
-if (!is_android) {
-  source_set("unit_tests") {
-    testonly = true
-    sources = [
-      "core/serialized_navigation_entry_unittest.cc",
-      "core/session_backend_unittest.cc",
-      "core/session_types_unittest.cc",
-      "ios/ios_serialized_navigation_builder_unittest.cc",
-      "ios/ios_serialized_navigation_driver_unittest.cc",
-    ]
-
-    if (!is_ios) {
-      sources += [
-        "content/content_serialized_navigation_builder_unittest.cc",
-        "content/content_serialized_navigation_driver_unittest.cc",
-      ]
-    }
-
-    public_deps = [
-      ":sessions",
-    ]
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "core/serialized_navigation_entry_unittest.cc",
+    "core/session_backend_unittest.cc",
+    "core/session_types_unittest.cc",
+    "ios/ios_serialized_navigation_builder_unittest.cc",
+    "ios/ios_serialized_navigation_driver_unittest.cc",
+  ]
 
-    deps = [
-      ":test_support",
-      "//base/test:test_support",
-      "//testing/gtest",
+  if (!is_ios) {
+    sources += [
+      "content/content_serialized_navigation_builder_unittest.cc",
+      "content/content_serialized_navigation_driver_unittest.cc",
     ]
   }
+
+  public_deps = [
+    ":sessions",
+  ]
+
+  deps = [
+    ":test_support",
+    "//base/test:test_support",
+    "//testing/gtest",
+  ]
 }