Roll //build, //native_client, and a few more targets of opportunity.

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 832 matching lines @@
     toolName = strdup(toolName);
     if (toolName != NULL)
       gToolName = toolName;
   }
   if (worker != NULL)
     free(worker);
 
   NSString* appPath = nil;
   NSString* appName = nil;
   NSString* sdkVersion = nil;
-  NSString* deviceName = IsRunningWithXcode6OrLater() ? @"iPhone 5" : @"iPhone";
+  NSString* deviceName =
+      IsRunningWithXcode6OrLater() ? @"iPhone 5s" : @"iPhone";
   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 157 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;
 }