Make content_unittests not crash on GN Android

content/test/BUILD.gn

Index: content/test/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 48e61632633fffc8336937865792ea343193b366..ae47f2fb6e06e1b07b1ee8ffa5a334f296cfa263 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -482,6 +482,25 @@ if (!is_mac) {
   }
 }
 
+if (is_android) {
+  content_unittests_apk_assets_dir =

[agrieve, 2015/10/21 01:13:01]

nit: prefix non-parameter variables with a _

+      "$root_build_dir/content_unittests_apk/assets"
+  copy_ex("copy_content_unittests_apk_assets") {
+    clear_dir = true
+    dest = "$content_unittests_apk_assets_dir"

[agrieve, 2015/10/21 01:13:01]

nit: no need for ""s

+
+    if (v8_use_external_startup_data) {
+      sources = [
+        "$root_build_dir/natives_blob.bin",
+        "$root_build_dir/snapshot_blob.bin",
+      ]
+      deps = [
+        "//v8",
+      ]
+    }
+  }
+}
+
 # TODO(GYP): Delete this after we've converted everything to GN.
 # The _run targets exist only for compatibility w/ GYP.
 group("content_unittests_run") {
@@ -659,7 +678,13 @@ test("content_unittests") {
       "../browser/webui/url_data_manager_backend_unittest.cc",
     ]
     deps -= [ "//device/battery" ]
-    deps += [ "//testing/android/native_test:native_test_native_code" ]
+    deps += [ ":copy_content_unittests_apk_assets" ]
+
+    apk_asset_location = "$content_unittests_apk_assets_dir"

[agrieve, 2015/10/21 01:13:01]

nit: drop the "$", just do apk_asset_location = content_unittests_apk_assets_dir

+    apk_deps = [
+      "//base:base_java_unittest_support",
+      "//content/public/android:content_java",
+    ]
   }
   if (!is_android && !is_ios) {
     deps += [ "//third_party/libvpx_new" ]