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"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_logging.h"
 #include "base/strings/sys_string_conversions.h"
 
 #if !defined(OS_IOS)
 extern "C" {
 CFTypeID SecACLGetTypeID();
 CFTypeID SecTrustedApplicationGetTypeID();
 }  // extern "C"
 #endif
 
 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;
+
+NSUInteger CheapPathNormalizedCount(NSArray* path_array) {

[Mark Mentovai, 2013/10/28 15:57:09]

Don’t use an unsigned, because count could legitimately wind up negative.

+  NSUInteger count = 0;
+  for (NSString* component in path_array) {
+    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;
 #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];
+  NSUInteger bundle_count =
+      CheapPathNormalizedCount([[bundle bundlePath] pathComponents]);
+  NSUInteger executable_count =
+      CheapPathNormalizedCount([[bundle executablePath] 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];
+  NSUInteger 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
   // http://crbug.com/63183 .
   static bool result = UncachedAmIBundled();
   DCHECK_EQ(result, UncachedAmIBundled())
       << "The return value of AmIBundled() changed. This will confuse tests. "
       << "Call SetAmIBundled() override manually if your test binary "
       << "delay-loads the framework.";
   return result;
@@ skipping 322 matching lines @@
         CFDictionaryGetValue(user_info.get(), kCFErrorDescriptionKey));
   }
   o << "Code: " << CFErrorGetCode(err)
     << " Domain: " << CFErrorGetDomain(err)
     << " Desc: " << desc.get();
   if(errorDesc) {
     o << "(" << errorDesc << ")";
   }
   return o;
 }