Fix iossim's support for retina devices.

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 473 matching lines @@
 // Creates the necessary directory structure under the given user home directory
 // path, then sets the path in the appropriate environment variable.
 // Returns YES if successful, NO if unable to create or initialize the given
 // directory.
 BOOL InitializeSimulatorUserHome(NSString* userHomePath, NSString* deviceName) {
   if (!CreateHomeDirSubDirs(userHomePath))
     return NO;
 
   // Set the device to simulate. Note that the iOS Simulator must not be running
   // for this setting to take effect.
-  NSMutableDictionary* plistDict =
-      [NSMutableDictionary dictionaryWithObject:deviceName
-                                         forKey:@"SimulateDevice"];
-  NSString* plistPath = @"Library/Preferences/com.apple.iphonesimulator.plist";
-  [plistDict writeToFile:[userHomePath stringByAppendingPathComponent:plistPath]
-              atomically:YES];
+  // Set the device to simulate. Note that the iOS Simulator must not be running
+  // for this setting to take effect.

[TVL, 2013/04/16 20:05:45]

duplicate comment?

[lliabraa, 2013/04/17 13:15:37]

Done.

[TVL, 2013/04/17 13:42:04]

New upload?

+  CFStringRef iPhoneSimulatorAppID = CFSTR("com.apple.iphonesimulator");
+  CFPreferencesSetAppValue(CFSTR("SimulateDevice"),
+                           deviceName,
+                           iPhoneSimulatorAppID);
+  CFPreferencesAppSynchronize(iPhoneSimulatorAppID);
 
   // Update the environment to use the specified directory as the user home
   // directory.
   // Note: the third param of setenv specifies whether or not to overwrite the
   // variable's value if it has already been set.
   if ((setenv(kUserHomeEnvVariable, [userHomePath UTF8String], YES) == -1) ||
       (setenv(kHomeEnvVariable, [userHomePath UTF8String], YES) == -1)) {
     LogError(@"Unable to set environment variables for home directory.");
     return NO;
   }
@@ skipping 62 matching lines @@
   int c;
   while ((c = getopt(argc, argv, "hs:d:u:e:t:")) != -1) {
     switch (c) {
       case 's':
         sdkVersion = [NSString stringWithUTF8String:optarg];
         break;
       case 'd':
         deviceName = [NSString stringWithUTF8String:optarg];
         break;
       case 'u':
         simHomePath = [[NSFileManager defaultManager]

[TVL, 2013/04/16 20:05:45]

is it even worth having this option any more and trying to create a directory?

[lliabraa, 2013/04/17 13:15:37]

Can you remind me what the issue is here? It seems to be working as intended
(i.e. using the -u value as the sandbox dir of the app:

$ rm -rf /tmp/iossim_home
$ xcodebuild/ninja-iossim/Debug/iossim -d "iPhone" -u /tmp/iossim_home/
xcodebuild/Debug-iphonesimulator/sql_unittests.app/
<output clipped>
$ ls /tmp/iossim_home/
Documents	Library

[TVL, 2013/04/17 13:42:04]

So the problem is what defaults the app (and simulator) actually get.  Since the
defaults daemon is caching things; it if has already loaded values it doesn't
reload new (empty) values based on this directory tree.  So the apps get the
values from the last run.  That's why our directly touching the file for the
simulator no longer works.  If the daemon hadn't loaded the simulator values it
worked; but once it had loaded them, any future runs didn't see the values we
wrote in the new files.

I guess we can leave it as is, because the simulator setting was the one most
breaking things, but any app that writes something to defaults and matching data
on disk might run into a mismatch now.

[lliabraa, 2013/04/17 16:52:03]

I see. So if we were to set up a dir for the simulator to use as it's home
directory, and put some .plist files in there, iossim wouldn't necessarily use
the because of the caching issue.

If that's the case, seems like the script that sets up the home dir and plist
files should be responsible for syncing them (i.e. CFPreferencesAppSynchronize).

If that's not the case, and I'm still not understanding, an example would help.

             stringWithFileSystemRepresentation:optarg length:strlen(optarg)];
         break;
       case 'e': {
         NSString* envLine = [NSString stringWithUTF8String:optarg];
         NSRange range = [envLine rangeOfString:@"="];
         if (range.location == NSNotFound) {
           LogError(@"Invalid key=value argument for -e.");
           PrintUsage();
           exit(kExitInvalidArguments);
         }
@@ skipping 126 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;
 }