Merge 231376 "Fix AmIBundled for command-line executions."

base/mac/foundation_util.mm

Index: base/mac/foundation_util.mm
===================================================================
--- base/mac/foundation_util.mm	(revision 232405)
+++ base/mac/foundation_util.mm	(working copy)
@@ -23,11 +23,26 @@
 namespace base {
 namespace mac {
 
-static bool g_override_am_i_bundled = false;
-static bool g_override_am_i_bundled_value = false;
+namespace {
 
-// Adapted from http://developer.apple.com/carbon/tipsandtricks.html#AmIBundled
-static bool UncachedAmIBundled() {
+bool g_override_am_i_bundled = false;
+bool g_override_am_i_bundled_value = false;
+
+int CheapPathNormalizedCount(NSString* path) {
+  int count = 0;
+  for (NSString* component in [path pathComponents]) {
+    if ([component isEqualToString:@"."])
+      continue;
+    else if ([component isEqualToString:@".."])
+      --count;
+    else
+      ++count;
+  }
+
+  return count;
+}
+
+bool UncachedAmIBundled() {
 #if defined(OS_IOS)
   // All apps are bundled on iOS.
   return true;
@@ -36,18 +51,20 @@
     return g_override_am_i_bundled_value;
 
   NSBundle* bundle = base::mac::OuterBundle();
-  NSArray* bundle_parts = [[bundle bundlePath] pathComponents];
-  NSArray* executable_parts = [[bundle executablePath] pathComponents];
+  int bundle_count = CheapPathNormalizedCount([bundle bundlePath]);
+  int executable_count = CheapPathNormalizedCount([bundle executablePath]);
 
   // 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];
+  int depth_difference = executable_count - bundle_count;
   CHECK(depth_difference == 1 || depth_difference == 3);
   return depth_difference == 3;
 #endif
 }
 
+}  // namespace
+
 bool AmIBundled() {
   // If the return value is not cached, this function will return different
   // values depending on when it's called. This confuses some client code, see