GN: asset_location -> android_assets() for html_viewer

testing/test.gni

 # Copyright 2015 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.
 
 # ==============================================================================
 # TEST SETUP
 # ==============================================================================
 
 # Define a test as an executable (or apk on Android) with the "testonly" flag
 # set.
@@ skipping 46 matching lines @@
       if (!defined(invoker.use_default_launcher) ||
           invoker.use_default_launcher) {
         deps += [ "//testing/android/native_test:native_test_native_code" ]
       }
       if (defined(invoker.deps)) {
         deps += invoker.deps
       }
     }
 
     unittest_apk(apk_name) {
+      forward_variables_from(invoker,
+                             [
+                               "android_manifest",
+                               "use_default_launcher",
+                               "write_asset_list",
+                             ])
+
       unittests_dep = ":$library_name"
       apk_name = main_target_name
       if (defined(invoker.output_name)) {
         apk_name = invoker.output_name
         unittests_binary = "lib${apk_name}.so"
       }
       deps = [
         ":$library_name",
       ]
       if (defined(invoker.apk_deps)) {
         deps += invoker.apk_deps
       }
       if (defined(invoker.apk_asset_location)) {
         asset_location = invoker.apk_asset_location
       }
-      if (defined(invoker.android_manifest)) {
-        android_manifest = invoker.android_manifest
-      }
-      if (defined(invoker.use_default_launcher)) {
-        use_default_launcher = invoker.use_default_launcher
-      }
     }
 
     _test_name = main_target_name
     if (defined(invoker.output_name)) {
       _test_name = invoker.output_name
     }
     test_runner_script_name = "${_test_name}__test_runner_script"
     test_runner_script(test_runner_script_name) {
       test_name = _test_name
       test_type = "gtest"
@@ skipping 99 matching lines @@
         # All shared libraries must have the sanitizer deps to properly link in
         # asan mode (this target will be empty in other cases).
         "//build/config/sanitizers:deps",
 
         # Give tests the default manifest on Windows (a no-op elsewhere).
         "//build/win:default_exe_manifest",
       ]
     }
   }
 }