Make the Android GN debug component build actually build.

Changes required:
- fold //base/third_party/nspr/prtime.cc into base
- fixed a compile error causing issues in media_blink_unittests
- fixed various missing dependencies
- disabled chrome_sync_shell_test_apk which needs some more work

Note that this does not mean that things run. I expect they don't :).

R=cjhopman@chromium.org
BUG=359249

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

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

base/BUILD.gn

@@ -497,6 +497,8 @@ component("base") {
     "third_party/dmg_fp/g_fmt.cc",
     "third_party/icu/icu_utf.cc",
     "third_party/icu/icu_utf.h",
+    "third_party/nspr/prtime.cc",
+    "third_party/nspr/prtime.h",
     "third_party/superfasthash/superfasthash.c",
     "thread_task_runner_handle.cc",
     "thread_task_runner_handle.h",
@@ -640,7 +642,6 @@ component("base") {
     ":base_static",
     "//base/allocator:allocator_extension_thunks",
     "//base/third_party/dynamic_annotations",
-    "//base/third_party/nspr",
     "//third_party/modp_b64",
   ]
 
@@ -1308,7 +1309,6 @@ test("base_unittests") {
     "//base/test:run_all_unittests",
     "//base/test:test_support",
     "//base/third_party/dynamic_annotations",
-    "//base/third_party/nspr",
     "//base/trace_event:trace_event_unittests",
     "//testing/gmock",
     "//testing/gtest",

base/third_party/nspr/BUILD.gn

-# Copyright (c) 2013 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-source_set("nspr") {
-  visibility = [ "//base/*" ]
-
-  sources = [
-    "prtime.cc",
-    "prtime.h",
-  ]
-
-  # In GYP this project is part of base, so it uses the base implementation
-  # define. TODO(brettw) rename this define.
-  configs += [ "//base:base_implementation" ]
-
-  if (is_android && !is_debug) {
-    configs -= [ "//build/config/compiler:optimize" ]
-    configs += [ "//build/config/compiler:optimize_max" ]
-  }
-}

chrome/android/BUILD.gn

@@ -412,11 +412,16 @@ android_library("chrome_javatests") {
     "//components/bookmarks/common/android:bookmarks_java",
     "//components/dom_distiller/android:dom_distiller_core_java",
     "//components/invalidation:java",
+    "//components/navigation_interception/android:navigation_interception_java",
+    "//components/precache/android:precache_java",
+    "//components/precache/android:precache_javatests",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//printing:printing_java",
     "//sync/android:sync_java",
+    "//sync/android:sync_javatests",
     "//sync:sync_java_test_support",
+    "//third_party/android_protobuf:protobuf_nano_javalib",
     "//third_party/android_tools:android_support_v13_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
@@ -468,27 +473,31 @@ junit_binary("chrome_junit_tests") {
 }
 
 # GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk
-android_apk("chrome_sync_shell_test_apk") {
-  testonly = true
-  deps = [
-    ":chrome_java",
-    ":chrome_shell_java",
-    ":chrome_shell_test_java",
-    "//base:base_java",
-    "//base:base_java_test_support",
-    "//chrome/test/android:chrome_java_test_support",
-    "//components/invalidation:java",
-    "//content/public/android:content_java",
-    "//content/public/test/android:content_java_test_support",
-    "//sync/android:sync_java",
-    "//sync:sync_java_test_support",
-    "//third_party/android_tools:android_support_v13_java",
-    "//third_party/android_tools:android_support_v7_appcompat_java",
-    "//ui/android:ui_java",
-  ]
-  apk_name = "ChromeSyncShellTest"
-  DEPRECATED_java_in_dir = "sync_shell/javatests/src"
-  android_manifest = "sync_shell/javatests/AndroidManifest.xml"
+if (false) {
+  # TODO(GYP): We need sync/sync_tests.gypi:test_support_sync_proto_java to be ported.
+  # crbug.com/475612
+  android_apk("chrome_sync_shell_test_apk") {
+    testonly = true
+    deps = [
+      ":chrome_java",
+      ":chrome_shell_java",
+      ":chrome_shell_test_java",
+      "//base:base_java",
+      "//base:base_java_test_support",
+      "//chrome/test/android:chrome_java_test_support",
+      "//components/invalidation:java",
+      "//content/public/android:content_java",
+      "//content/public/test/android:content_java_test_support",
+      "//sync/android:sync_java",
+      "//sync:sync_java_test_support",
+      "//third_party/android_tools:android_support_v13_java",
+      "//third_party/android_tools:android_support_v7_appcompat_java",
+      "//ui/android:ui_java",
+    ]
+    apk_name = "ChromeSyncShellTest"
+    DEPRECATED_java_in_dir = "sync_shell/javatests/src"
+    android_manifest = "sync_shell/javatests/AndroidManifest.xml"
+  }
 }
 
 # GYP: //chrome/chrome_tests.gypi:chrome_shell_uiautomator_tests_java

components/BUILD.gn

@@ -76,8 +76,6 @@ group("all_components") {
     "//components/precache/core",
     "//components/precache/content",
     "//components/pref_registry",
-    "//components/proximity_auth",
-    "//components/proximity_auth/cryptauth",
     "//components/query_parser",
     "//components/rappor",
     "//components/renderer_context_menu",
@@ -118,6 +116,13 @@ group("all_components") {
     "//components/wifi_sync",
   ]
 
+  if (!is_android && !is_ios) {
+    deps += [
+      "//components/proximity_auth",
+      "//components/proximity_auth/cryptauth",
+    ]
+  }
+
   if (!enable_configuration_policy) {
     deps -= [ "//components/policy" ]
   }
@@ -261,7 +266,6 @@ test("components_unittests") {
     "//components/omnibox:unit_tests",
     "//components/ownership:unit_tests",
     "//components/packed_ct_ev_whitelist:unit_tests",
-    "//components/proximity_auth:unit_tests",
     "//components/update_client:unit_tests",
     "//components/variations:unit_tests",
     "//components/web_resource:unit_tests",
@@ -275,6 +279,10 @@ test("components_unittests") {
   ]
   data_deps = [ ":components_tests_pak" ]
 
+  if (!is_android && !is_ios) {
+    deps += [ "//components/proximity_auth:unit_tests" ]
+  }
+
   # TODO(GYP) need this target.
   #'breakpad/app/crash_keys_win_unittest.cc',
 

components/autofill/core/browser/BUILD.gn

@@ -210,6 +210,7 @@ static_library("test_support") {
     "//components/os_crypt",
     "//components/pref_registry",
     "//components/rappor",
+    "//google_apis:test_support",
     "//skia",
     "//testing/gtest",
   ]

content/browser/BUILD.gn

@@ -322,6 +322,7 @@ source_set("browser") {
       "geolocation/network_location_provider.h",
       "geolocation/network_location_request.cc",
       "geolocation/network_location_request.h",
+      "renderer_host/begin_frame_observer_proxy.cc",
       "tracing/tracing_ui.cc",
       "tracing/tracing_ui.h",
 

content/test/BUILD.gn

@@ -582,6 +582,7 @@ if (!is_mac) {  # TODO(GYP) enable on Mac once it links.
       sources -= [
         "../browser/geolocation/network_location_provider_unittest.cc",
         "../browser/geolocation/wifi_data_provider_common_unittest.cc",
+        "../browser/renderer_host/begin_frame_observer_proxy_unittest.cc",
         "../browser/webui/url_data_manager_backend_unittest.cc",
       ]
       deps += [ "//testing/android/native_test:native_test_native_code" ]

media/blink/BUILD.gn

@@ -124,5 +124,9 @@ if (!is_mac) {
       "video_frame_compositor_unittest.cc",
       "webaudiosourceprovider_impl_unittest.cc",
     ]
+
+    if (is_android) {
+      deps += [ "//ui/gl" ]
+    }
   }
 }

media/blink/key_system_config_selector_unittest.cc

@@ -218,7 +218,7 @@ class KeySystemConfigSelectorTest : public testing::Test {
   scoped_ptr<FakeMediaPermission> media_permission_;
 
   // Held values for the call to SelectConfig().
-  blink::WebString key_system_ = kSupported;
+  blink::WebString key_system_ = blink::WebString::fromUTF8(kSupported);
   std::vector<blink::WebMediaKeySystemConfiguration> configs_;
   blink::WebSecurityOrigin security_origin_ =
       blink::WebSecurityOrigin::createFromString(kDefaultSecurityOrigin);