Renamed ios_unittests target to ios_web_unittests.

ios_unittests name does not reflect the real purpose of the target.
Enable the tests on the try bots.

BUG=462150

Review URL: https://codereview.chromium.org/951383002

Cr-Commit-Position: refs/heads/master@{#318428}

6 files changed, 45 insertions, 30 deletions

diff --git a/ios/build/bots/chromium.fyi/Chromium_iOS_Simulator_(dbg).json b/ios/build/bots/chromium.fyi/Chromium_iOS_Simulator_(dbg).json
index ba47f4f1..e6e7e5d 100644
--- a/ios/build/bots/chromium.fyi/Chromium_iOS_Simulator_(dbg).json
+++ b/ios/build/bots/chromium.fyi/Chromium_iOS_Simulator_(dbg).json
@@ -20,6 +20,11 @@
       "os": "7.1"
     },
     {
+      "app": "ios_web_unittests",
+      "device type": "iPhone Retina (4-inch)",
+      "os": "7.1"
+    },
+    {
       "app": "base_unittests",
       "device type": "iPhone Retina (4-inch)",
       "os": "7.1"
diff --git a/ios/build/bots/chromium.mac/iOS_Simulator_(dbg).json b/ios/build/bots/chromium.mac/iOS_Simulator_(dbg).json
index ba47f4f1..e6e7e5d 100644
--- a/ios/build/bots/chromium.mac/iOS_Simulator_(dbg).json
+++ b/ios/build/bots/chromium.mac/iOS_Simulator_(dbg).json
@@ -20,6 +20,11 @@
       "os": "7.1"
     },
     {
+      "app": "ios_web_unittests",
+      "device type": "iPhone Retina (4-inch)",
+      "os": "7.1"
+    },
+    {
       "app": "base_unittests",
       "device type": "iPhone Retina (4-inch)",
       "os": "7.1"
diff --git a/ios/build/bots/tryserver.chromium.mac/ios_dbg_simulator_ninja.json b/ios/build/bots/tryserver.chromium.mac/ios_dbg_simulator_ninja.json
index e1de930..fba214a 100644
--- a/ios/build/bots/tryserver.chromium.mac/ios_dbg_simulator_ninja.json
+++ b/ios/build/bots/tryserver.chromium.mac/ios_dbg_simulator_ninja.json
@@ -20,6 +20,11 @@
       "os": "7.1"
     },
     {
+      "app": "ios_web_unittests",
+      "device type": "iPhone Retina (4-inch)",
+      "os": "7.1"
+    },
+    {
       "app": "base_unittests",
       "device type": "iPhone Retina (4-inch)",
       "os": "7.1"
diff --git a/ios/ios.gyp b/ios/ios.gyp
index c519585..8bae0e2 100644
--- a/ios/ios.gyp
+++ b/ios/ios.gyp
@@ -11,10 +11,10 @@
       'type': 'none',
       'dependencies': [
         'chrome/ios_chrome_tests.gyp:*',
-        'ios_tests_unit.gyp:*',
         'provider/ios_provider_chrome.gyp:*',
         'provider/ios_provider_web.gyp:*',
         'web/ios_web.gyp:*',
+        'web/ios_web_unittests.gyp:*',
       ],
     },
   ],
diff --git a/ios/ios_tests_unit.gyp b/ios/ios_tests_unit.gyp
deleted file mode 100644
index 817dd47..0000000
--- a/ios/ios_tests_unit.gyp
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2013 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.
-{
-  'variables': {
-    'chromium_code': 1,
-   },
-  'targets': [
-    {
-      'target_name': 'ios_unittests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:run_all_unittests',
-        '../base/base.gyp:test_support_base',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        'web/ios_web.gyp:ios_web',
-        'web/ios_web.gyp:test_support_ios_web',
-      ],
-      'sources': [
-        'web/browser_state_unittest.cc',
-        'web/navigation/navigation_item_impl_unittest.mm',
-        'web/string_util_unittest.cc',
-        'web/url_scheme_util_unittest.mm',
-      ],
-    },
-  ],
-}
diff --git a/ios/web/ios_web_unittests.gyp b/ios/web/ios_web_unittests.gyp
new file mode 100644
index 0000000..994d09d
--- /dev/null
+++ b/ios/web/ios_web_unittests.gyp
@@ -0,0 +1,29 @@
+# Copyright 2013 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.
+{
+  'variables': {
+    'chromium_code': 1,
+   },
+  'targets': [
+    {
+      'target_name': 'ios_web_unittests',
+      'type': '<(gtest_target_type)',
+      'dependencies': [
+        '../../base/base.gyp:base',
+        '../../base/base.gyp:run_all_unittests',
+        '../../base/base.gyp:test_support_base',
+        '../../testing/gmock.gyp:gmock',
+        '../../testing/gtest.gyp:gtest',
+        'ios_web.gyp:ios_web',
+        'ios_web.gyp:test_support_ios_web',
+      ],
+      'sources': [
+        'browser_state_unittest.cc',
+        'navigation/navigation_item_impl_unittest.mm',
+        'string_util_unittest.cc',
+        'url_scheme_util_unittest.mm',
+      ],
+    },
+  ],
+}