GN(Android): Fix up webkit_unit_tests to match GYP

third_party/WebKit/Source/bindings/bindings.gni

Index: third_party/WebKit/Source/bindings/bindings.gni
diff --git a/third_party/WebKit/Source/bindings/bindings.gni b/third_party/WebKit/Source/bindings/bindings.gni
index 3bc58a247b92089d9fe55c73a7d956e8ae78146b..c237fd1e2be6c52850bdb50433a4752ff22e9482 100644
--- a/third_party/WebKit/Source/bindings/bindings.gni
+++ b/third_party/WebKit/Source/bindings/bindings.gni
@@ -5,29 +5,32 @@
 # All paths in this file should be absolute so it can be imported into
 # different contexts.
 
+import("//third_party/WebKit/Source/bindings/modules/v8/v8.gni")
+
 # core/v8/custom/custom.gypi ---------------------------------------------------
 
 # These paths are relative to v8/custom.
-_core_v8_custom_gypi = exec_script(
-    "//build/gypi_to_gn.py",
-    [ rebase_path("core/v8/custom/custom.gypi") ],
-    "scope",
-    [ "core/v8/custom/custom.gypi" ])
+_core_v8_custom_gypi =
+    exec_script("//build/gypi_to_gn.py",
+                [ rebase_path("core/v8/custom/custom.gypi") ],
+                "scope",
+                [ "core/v8/custom/custom.gypi" ])
 
 bindings_core_v8_custom_dir = get_path_info("core/v8/custom", "abspath")
-bindings_core_v8_custom_files = get_path_info(
-    rebase_path(_core_v8_custom_gypi.bindings_core_v8_custom_files, ".",
-                bindings_core_v8_custom_dir),
-    "abspath")
+bindings_core_v8_custom_files =
+    get_path_info(
+        rebase_path(_core_v8_custom_gypi.bindings_core_v8_custom_files,
+                    ".",
+                    bindings_core_v8_custom_dir),
+        "abspath")
 
 # core/v8/v8.gypi --------------------------------------------------------------
 
 # These paths are relative to v8.
-_core_v8_gypi = exec_script(
-    "//build/gypi_to_gn.py",
-    [ rebase_path("core/v8/v8.gypi") ],
-    "scope",
-    [ "core/v8/v8.gypi" ])
+_core_v8_gypi = exec_script("//build/gypi_to_gn.py",
+                            [ rebase_path("core/v8/v8.gypi") ],
+                            "scope",
+                            [ "core/v8/v8.gypi" ])
 
 bindings_core_v8_dir = get_path_info("core/v8", "abspath")
 
@@ -35,9 +38,9 @@ bindings_core_v8_dir = get_path_info("core/v8", "abspath")
 # expand that.
 _rel_bindings_core_v8_files = _core_v8_gypi.bindings_core_v8_files
 _rel_bindings_core_v8_files -= [ "<@(bindings_core_v8_custom_files)" ]
-bindings_core_v8_files = get_path_info(
-    rebase_path(_rel_bindings_core_v8_files, ".", "core/v8"),
-    "abspath")
+bindings_core_v8_files =
+    get_path_info(rebase_path(_rel_bindings_core_v8_files, ".", "core/v8"),
+                  "abspath")
 bindings_core_v8_files += bindings_core_v8_custom_files
 
 # bindings.gypi ----------------------------------------------------------------
@@ -46,6 +49,8 @@ bindings_dir = get_path_info(".", "abspath")
 blink_output_dir = "$root_gen_dir/blink"
 bindings_output_dir = "$root_gen_dir/blink/bindings"
 
-bindings_unittest_files = get_path_info(
-    rebase_path(_core_v8_gypi.bindings_core_v8_unittest_files, ".", bindings_core_v8_dir),
-    "abspath")
+bindings_unittest_files =
+    get_path_info(rebase_path(_core_v8_gypi.bindings_core_v8_unittest_files,
+                              ".",
+                              bindings_core_v8_dir),
+                  "abspath") + bindings_modules_v8_unittest_files