Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(757)

Unified Diff: testing/iossim/iossim.mm

Issue 379863002: In iossim, fix default device value for Xcode 6. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/iossim/iossim.mm
diff --git a/testing/iossim/iossim.mm b/testing/iossim/iossim.mm
index b8c9ecec1706277be7b06319c6018278c542e4e7..1593a5a154472d8d83098d9828e21715474a1749 100644
--- a/testing/iossim/iossim.mm
+++ b/testing/iossim/iossim.mm
@@ -177,11 +177,7 @@ 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]];
@@ -757,7 +753,13 @@ int main(int argc, char* const argv[]) {
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];
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698