Revert of Work around a bug where create_bundle() is ignoring data_deps() in iOS GN build.

build/config/ios/rules.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.
 
 import("//build/config/ios/ios_sdk.gni")
 
 # TODO(crbug.com/297668): refactor this template to extract common behaviour
 # between OS X and iOS bundle generation, then create a generic "app" template
 # that forward to "executable" on all platform except iOS/OS X.
 
@@ skipping 96 matching lines @@
                              "info_plist",
                              "output_name",
                              "visibility",
                            ])
 
     output_name = rebase_path("$target_gen_dir/$_output_name", root_build_dir)
     if (!defined(libs)) {
       libs = []
     }
     libs += [ "UIKit.framework" ]
-
-    # TODO(crbug.com/599203) - iossim should probably be a data dependency
-    # of the create_bundle(target_name) target instead but at the moment
-    # create_bundle() is ignoring data_deps.
-    if (use_ios_simulator) {
-      if (!defined(data_deps)) {
-        data_deps = []
-      }
-      data_deps += [ "//testing/iossim(${host_toolchain})" ]
-    }
   }
 
   bundle_data(_bundle_data_executable) {
     forward_variables_from(invoker, [ "testonly" ])
     visibility = [ ":$_target_name" ]
     sources = [
       "$target_gen_dir/$_output_name",
     ]
     outputs = [
       "{{bundle_executable_dir}}/$_output_name",
@@ skipping 14 matching lines @@
                            ])
 
     if (!defined(deps)) {
       deps = []
     }
     deps += [
       ":$_bundle_data_executable",
       ":$_bundle_data_info_plist",
     ]
 
+    if (use_ios_simulator) {
+      if (!defined(data_deps)) {
+        data_deps = []
+      }
+      data_deps += [ "//testing/iossim(${host_toolchain})" ]
+    }
+
     bundle_root_dir = "$root_out_dir/$_output_name.app"
     bundle_resources_dir = bundle_root_dir
     bundle_executable_dir = bundle_root_dir
     bundle_plugins_dir = "$bundle_root_dir/Plugins"
   }
 
   # TODO(crbug.com/297668):
   # - add support for codesigning,
   # - find a way to make "ninja -C out/Default base_unittests.app" work as
   #   an alias to "ninja -C out/Default base_unittests" (for convenience
@@ skipping 52 matching lines @@
 
     sources = [
       "$target_gen_dir/$_nib_filename/objects.nib",
       "$target_gen_dir/$_nib_filename/runtime.nib",
     ]
     outputs = [
       "{{bundle_resources_dir}}/$_nib_filename/{{source_file_part}}",
     ]
   }
 }