Run both iPhone and iPad simulator tests on iOS bots

This matches downstream, where we build a universal binary, and then run tests on the 64-bit iPhone 5s simulator and the 32-bit iPad Retina simulator.

BUG=490189

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

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

ios/build/bots/chromium.fyi/Chromium_iOS_Simulator_(dbg).json

@@ -3,7 +3,7 @@
     "smut"
   ],
   "comments": [
-    "Tests for 32- and 64-bit iOS 8.3 iPhone simulators."
+    "Tests for 32- and 64-bit iOS 8.3 simulators."
   ],
   "xcode version": "6.3",
   "GYP_DEFINES": {
@@ -16,12 +16,12 @@
   "tests": [
     {
       "include": "common_tests.json",
-      "device type": "iPhone 5",
+      "device type": "iPhone 5s",
       "os": "8.3"
     },
     {
       "include": "common_tests.json",
-      "device type": "iPhone 5s",
+      "device type": "iPad Retina",
       "os": "8.3"
     }
   ]

ios/build/bots/chromium.mac/iOS_Simulator_(dbg).json

@@ -3,7 +3,7 @@
     "smut"
   ],
   "comments": [
-    "Tests for 32- and 64-bit iOS 8.3 iPhone simulators."
+    "Tests for 32- and 64-bit iOS 8.3 simulators."
   ],
   "xcode version": "6.3",
   "GYP_DEFINES": {
@@ -16,12 +16,12 @@
   "tests": [
     {
       "include": "common_tests.json",
-      "device type": "iPhone 5",
+      "device type": "iPhone 5s",
       "os": "8.3"
     },
     {
       "include": "common_tests.json",
-      "device type": "iPhone 5s",
+      "device type": "iPad Retina",
       "os": "8.3"
     }
   ]

ios/build/bots/tryserver.chromium.mac/ios_dbg_simulator.json

@@ -3,7 +3,7 @@
     "smut"
   ],
   "comments": [
-    "Tests for 32- and 64-bit iOS 8.3 iPhone simulators."
+    "Tests for 32- and 64-bit iOS 8.3 simulators."
   ],
   "xcode version": "6.3",
   "GYP_DEFINES": {
@@ -16,12 +16,12 @@
   "tests": [
     {
       "include": "common_tests.json",
-      "device type": "iPhone 5",
+      "device type": "iPhone 5s",
       "os": "8.3"
     },
     {
       "include": "common_tests.json",
-      "device type": "iPhone 5s",
+      "device type": "iPad Retina",
       "os": "8.3"
     }
   ]

ios/build/bots/tryserver.chromium.mac/ios_dbg_simulator_ninja.json

@@ -3,7 +3,7 @@
     "smut"
   ],
   "comments": [
-    "Tests for 32- and 64-bit iOS 8.3 iPhone simulators."
+    "Tests for 32- and 64-bit iOS 8.3 simulators."
   ],
   "xcode version": "6.3",
   "GYP_DEFINES": {
@@ -16,12 +16,12 @@
   "tests": [
     {
       "include": "common_tests.json",
-      "device type": "iPhone 5",
+      "device type": "iPhone 5s",
       "os": "8.3"
     },
     {
       "include": "common_tests.json",
-      "device type": "iPhone 5s",
+      "device type": "iPad Retina",
       "os": "8.3"
     }
   ]