Add bundle_deps to ios_{app,framework}_bundle templates.

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
 # ==============================================================================
 
 template("_gen_isolate") {
   testonly = true
@@ skipping 263 matching lines @@
         ":${invoker.target_name}",
       ]
     }
   } else if (is_ios) {
     import("//build/config/ios/rules.gni")
 
     _test_target = target_name
     _resources_bundle_data = target_name + "_resources_bundle_data"
 
     bundle_data(_resources_bundle_data) {
-      visibility = [ ":*" ]
+      visibility = [ ":$_test_target" ]
       sources = [
         "//testing/gtest_ios/Default.png",
       ]
       outputs = [
         "{{bundle_resources_dir}}/{{source_file_part}}",
       ]
     }
 
     ios_app_bundle(_test_target) {
       testonly = true
@@ skipping 18 matching lines @@
 
       if (!defined(extra_substitutions)) {
         extra_substitutions = []
       }
       extra_substitutions += [ "BUNDLE_ID_TEST_NAME=$app_name" ]
 
       if (!defined(deps)) {
         deps = []
       }
       deps += [
-        ":$_resources_bundle_data",
-
         # 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",
       ]
+      if (!defined(bundle_deps)) {
+        bundle_deps = []
+      }
+      bundle_deps += [ ":$_resources_bundle_data" ]
     }
   } else {
     executable(target_name) {
       deps = []
       forward_variables_from(invoker, "*")
 
       testonly = true
       deps += [
         # All shared libraries must have the sanitizer deps to properly link in
         # asan mode (this target will be empty in other cases).
@@ skipping 25 matching lines @@
 }
 
 # Test defaults.
 set_defaults("test") {
   if (is_android) {
     configs = default_shared_library_configs
   } else {
     configs = default_executable_configs
   }
 }