Get iossim to compile with Xcode 6.

testing/iossim/iossim.mm

Index: testing/iossim/iossim.mm
diff --git a/testing/iossim/iossim.mm b/testing/iossim/iossim.mm
index 6187973183aa4fa7443222af3724c0a807d5c981..1b00e25cbc1b192f2d2d2614db93233e404d3f63 100644
--- a/testing/iossim/iossim.mm
+++ b/testing/iossim/iossim.mm
@@ -14,34 +14,53 @@
 // For best results, the iOS Simulator application should not be running when
 // iossim is invoked.
 //
-// Headers for the iPhoneSimulatorRemoteClient framework used in this tool are
-// generated by class-dump, via GYP.
+// Headers for iPhoneSimulatorRemoteClient and other frameworks used in this
+// tool are generated by class-dump, via GYP.
 // (class-dump is available at http://www.codethecode.com/projects/class-dump/)
 //
 // However, there are some forward declarations required to get things to
-// compile. Also, the DTiPhoneSimulatorSessionDelegate protocol is referenced
-// by the iPhoneSimulatorRemoteClient framework, but not defined in the object
-// file, so it must be defined here before importing the generated
-// iPhoneSimulatorRemoteClient.h file.
+// compile.
 
-@class DTiPhoneSimulatorApplicationSpecifier;
-@class DTiPhoneSimulatorSession;
-@class DTiPhoneSimulatorSessionConfig;
-@class DTiPhoneSimulatorSystemRoot;
-@class DVTiPhoneSimulatorMessenger;
+// TODO(lliabraa): Once all builders are on Xcode 6 this ifdef can be removed
+// (crbug.com/385030).
+#if defined(IOSSIM_USE_XCODE_6)
+@class DVTStackBacktrace;
+#import "DVTFoundation.h"
+#endif  // IOSSIM_USE_XCODE_6
 
-@interface DVTPlatform : NSObject
-+ (BOOL)loadAllPlatformsReturningError:(id*)arg1;
+@protocol OS_dispatch_queue
 @end
-
 @protocol OS_dispatch_source
 @end
-@protocol OS_dispatch_queue
+// TODO(lliabraa): Once all builders are on Xcode 6 this ifdef can be removed
+// (crbug.com/385030).
+#if defined(IOSSIM_USE_XCODE_6)
+@protocol OS_xpc_object
 @end
-@class DVTDispatchLock;
+@protocol SimBridge;
+@class SimDeviceSet;
+@class SimDeviceType;
+@class SimRuntime;
+@class SimServiceConnectionManager;
+#import "CoreSimulator.h"
+#endif  // IOSSIM_USE_XCODE_6
+
+@interface DVTPlatform : NSObject
++ (BOOL)loadAllPlatformsReturningError:(id*)arg1;
+@end
+@class DTiPhoneSimulatorApplicationSpecifier;
+@class DTiPhoneSimulatorSession;
+@class DTiPhoneSimulatorSessionConfig;
+@class DTiPhoneSimulatorSystemRoot;
 @class DVTConfinementServiceConnection;
+@class DVTDispatchLock;
+@class DVTiPhoneSimulatorMessenger;
+@class DVTNotificationToken;
 @class DVTTask;
-
+// The DTiPhoneSimulatorSessionDelegate protocol is referenced
+// by the iPhoneSimulatorRemoteClient framework, but not defined in the object
+// file, so it must be defined here before importing the generated
+// iPhoneSimulatorRemoteClient.h file.
 @protocol DTiPhoneSimulatorSessionDelegate
 - (void)session:(DTiPhoneSimulatorSession*)session
     didEndWithError:(NSError*)error;
@@ -49,7 +68,6 @@
        didStart:(BOOL)started
       withError:(NSError*)error;
 @end
-
 #import "DVTiPhoneSimulatorRemoteClient.h"
 
 // An undocumented system log key included in messages from launchd. The value
@@ -84,9 +102,14 @@ const NSTimeInterval kDefaultSessionStartTimeoutSeconds = 30;
 const NSTimeInterval kOutputPollIntervalSeconds = 0.1;
 
 // The path within the developer dir of the private Simulator frameworks.
+#if defined(IOSSIM_USE_XCODE_6)
+NSString* const kSimulatorFrameworkRelativePath =
+    @"../SharedFrameworks/DVTiPhoneSimulatorRemoteClient.framework";
+#else
 NSString* const kSimulatorFrameworkRelativePath =
     @"Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks/"
     @"DVTiPhoneSimulatorRemoteClient.framework";
+#endif  // IOSSIM_USE_XCODE_6
 NSString* const kDVTFoundationRelativePath =
     @"../SharedFrameworks/DVTFoundation.framework";
 NSString* const kDevToolsFoundationRelativePath =
@@ -757,6 +780,7 @@ int main(int argc, char* const argv[]) {
       exit(kExitInitializationFailure);
     }
   }
+
   if (!InitializeSimulatorUserHome(simHomePath)) {
     LogError(@"Unable to initialize home directory for simulator: %@",
              simHomePath);