Fix AmIBundled for command-line executions.

base/mac/foundation_util.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.
 
 #include "base/mac/foundation_util.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "base/files/file_path.h"
@@ skipping 18 matching lines @@
 // Adapted from http://developer.apple.com/carbon/tipsandtricks.html#AmIBundled
 static bool UncachedAmIBundled() {
 #if defined(OS_IOS)
   // All apps are bundled on iOS.
   return true;
 #else
   if (g_override_am_i_bundled)
     return g_override_am_i_bundled_value;
 
   NSBundle* bundle = base::mac::OuterBundle();
-  NSArray* bundle_parts = [[bundle bundlePath] pathComponents];
-  NSArray* executable_parts = [[bundle executablePath] pathComponents];
+  NSArray* bundle_parts =
+      [[[bundle bundlePath] stringByStandardizingPath] pathComponents];

[Mark Mentovai, 2013/10/25 22:54:56]

This isn’t really correct. The tilde expansion it might do is wrong (in case a
directory begins with a ~ and you launch it as \~whatever/Google\ Chrome.app/… .

Which relative path invocations are you concerned about here?

https://developer.apple.com/library/mac/documentation/cocoa/Reference/Foundat...

says that this only resolves .. in absolute paths. And it says that in that
case, it uses stringByResolvingSymlinksInPath, which we don’t want to use here
because it does disk I/O.

+  NSArray* executable_parts =
+      [[[bundle executablePath] stringByStandardizingPath] pathComponents];
 
   // Bundled executables are exactly three levels deeper than their bundle.
   // Non-bundled executables have a fake bundle with a bundle path of their
   // parent directory.
   NSUInteger depth_difference = [executable_parts count] - [bundle_parts count];
   CHECK(depth_difference == 1 || depth_difference == 3);
   return depth_difference == 3;
 #endif
 }
 
@@ skipping 332 matching lines @@
         CFDictionaryGetValue(user_info.get(), kCFErrorDescriptionKey));
   }
   o << "Code: " << CFErrorGetCode(err)
     << " Domain: " << CFErrorGetDomain(err)
     << " Desc: " << desc.get();
   if(errorDesc) {
     o << "(" << errorDesc << ")";
   }
   return o;
 }