In iossim, fix default device value for Xcode 6.

testing/iossim/iossim.mm

 // Copyright (c) 2012 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 <Foundation/Foundation.h>
 #include <asl.h>
 #include <libgen.h>
 #include <stdarg.h>
 #include <stdio.h>
 
@@ skipping 159 matching lines @@
     exit(kExitInitializationFailure);
   }
   return theClass;
 }
 
 // Prints supported devices and SDKs.
 void PrintSupportedDevices() {
 // TODO(lliabraa): Once all builders are on Xcode 6 this ifdef can be removed
 // (crbug.com/385030).
 #if defined(IOSSIM_USE_XCODE_6)
-  printf("Retrieving supported devices:\n");
-  Class simServiceConnectionManagerClass =
-      FindClassByName(@"SimServiceConnectionManager");
-  [[simServiceConnectionManagerClass sharedConnectionManager] connect];
-
+  printf("Supported device/SDK combinations:\n");
   Class simDeviceSetClass = FindClassByName(@"SimDeviceSet");
   id deviceSet =
       [simDeviceSetClass setForSetPath:[simDeviceSetClass defaultSetPath]];
   for (id simDevice in [deviceSet availableDevices]) {
     NSString* deviceInfo =
         [NSString stringWithFormat:@"  -d '%@' -s '%@'\n",
             [simDevice name], [[simDevice runtime] versionString]];
     printf("%s", [deviceInfo UTF8String]);
   }
 #else
@@ skipping 555 matching lines @@
     toolName = strdup(toolName);
     if (toolName != NULL)
       gToolName = toolName;
   }
   if (worker != NULL)
     free(worker);
 
   NSString* appPath = nil;
   NSString* appName = nil;
   NSString* sdkVersion = nil;
+// TODO(lliabraa): Once all builders are on Xcode 6 this ifdef can be removed
+// (crbug.com/385030).
+#if defined(IOSSIM_USE_XCODE_6)
+  NSString* deviceName = @"iPhone 5";
+#else
   NSString* deviceName = @"iPhone";
+#endif
   NSString* simHomePath = nil;
   NSMutableArray* appArgs = [NSMutableArray array];
   NSMutableDictionary* appEnv = [NSMutableDictionary dictionary];
   NSTimeInterval sessionStartTimeout = kDefaultSessionStartTimeoutSeconds;
 
   NSString* developerDir = FindDeveloperDir();
   if (!developerDir) {
     LogError(@"Unable to find developer directory.");
     exit(kExitInitializationFailure);
   }
@@ skipping 156 matching lines @@
              [error localizedDescription],
              [error domain], static_cast<long int>([error code]));
   }
 
   // Note that this code is only executed if the simulator fails to start
   // because once the main run loop is started, only the delegate calling
   // exit() will end the program.
   [pool drain];
   return kExitFailure;
 }