Functions to return locations of various Chrome bundles.

base/mac/bundle_locations.mm

Index: base/mac/bundle_locations.mm
diff --git a/base/mac/bundle_locations.mm b/base/mac/bundle_locations.mm
new file mode 100644
index 0000000000000000000000000000000000000000..e1c0e1327e8c55ae6183375973416ab3c5fa89fc
--- /dev/null
+++ b/base/mac/bundle_locations.mm
@@ -0,0 +1,92 @@
+// 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/bundle_locations.h"
+
+#include "base/logging.h"
+#include "base/sys_string_conversions.h"
+
+namespace base {
+namespace mac {
+
+// Functions in this file must assert thread safety since NSBundle isn't
+// threadsafe.
+static NSBundle* g_override_framework_bundle = nil;
+static NSBundle* g_override_outer_bundle = nil;
+
+NSBundle* MainBundle() {
+  DCHECK([NSThread isMainThread]);

[Mark Mentovai, 2012/01/11 19:11:42]

I don’t know if these DCHECKs are a good idea.

+  return [NSBundle mainBundle];
+}
+
+FilePath MainBundlePath() {
+  DCHECK([NSThread isMainThread]);

[Mark Mentovai, 2012/01/11 19:11:42]

Don’t do this here, MainBundle does it anyway.

Same in the other *Path functions.

+  NSBundle* bundle = MainBundle();
+  return FilePath([[bundle bundlePath] fileSystemRepresentation]);
+}
+
+NSBundle* OuterBundle() {
+  DCHECK([NSThread isMainThread]);
+  if (g_override_outer_bundle)
+    return g_override_outer_bundle;
+  return [NSBundle mainBundle];
+}
+
+FilePath OuterBundlePath() {
+  DCHECK([NSThread isMainThread]);
+  NSBundle* bundle = OuterBundle();
+  return FilePath([[bundle bundlePath] fileSystemRepresentation]);
+}
+
+NSBundle* FrameworkBundle() {
+  DCHECK([NSThread isMainThread]);
+  if (g_override_framework_bundle)
+    return g_override_framework_bundle;
+  return [NSBundle mainBundle];
+}
+
+FilePath FrameworkBundlePath() {
+  DCHECK([NSThread isMainThread]);
+  NSBundle* bundle = FrameworkBundle();
+  return FilePath([[bundle bundlePath] fileSystemRepresentation]);
+}
+
+static void AssignOverrideBundle(NSBundle* new_bundle,
+                                 NSBundle* override_bundle) {

[Mark Mentovai, 2012/01/11 19:11:42]

I don’t think this does what you think it does. How does this ever write into
g_override_framework_bundle or g_override_outer_bundle without accepting an
NSBundle** parameter?

+  if (new_bundle != override_bundle) {
+    [override_bundle release];
+    override_bundle = [new_bundle retain];
+  }
+}
+
+static void AssignOverridePath(const FilePath& file_path,
+                               NSBundle* override_bundle) {
+  NSString* path = base::SysUTF8ToNSString(file_path.value());
+  NSBundle* new_bundle = [NSBundle bundleWithPath:path];
+  DCHECK(new_bundle) << "Failed to load the bundle at " << file_path.value();
+  AssignOverrideBundle(new_bundle, override_bundle);
+}
+
+void SetOverrideOuterBundle(NSBundle* bundle) {
+  DCHECK([NSThread isMainThread]);

[Mark Mentovai, 2012/01/11 19:11:42]

Again, not sure about these DCHCEKs, but if you are to DCHECK, you should
probably just have one inside AssignOverrideBundle.

+  AssignOverrideBundle(bundle, g_override_outer_bundle);
+}
+
+void SetOverrideFrameworkBundle(NSBundle* bundle) {
+  DCHECK([NSThread isMainThread]);
+  AssignOverrideBundle(bundle, g_override_framework_bundle);
+}
+
+void SetOverrideOuterBundlePath(const FilePath& file_path) {
+  DCHECK([NSThread isMainThread]);
+  AssignOverridePath(file_path, g_override_outer_bundle);
+}
+
+void SetOverrideFrameworkBundlePath(const FilePath& file_path) {
+  DCHECK([NSThread isMainThread]);
+  AssignOverridePath(file_path, g_override_framework_bundle);
+}
+
+}  // namespace mac
+}  // namespace base