[mac] Make app shims look in the correct user data dir on Canary.

chrome/common/chrome_paths_mac.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 "chrome/common/chrome_paths_internal.h"
 
 #import <Foundation/Foundation.h>
 #include <string.h>
 
 #include <string>
@@ skipping 33 matching lines @@
   // From C.app/Contents/Versions/1.2.3.4, go up three steps to get to C.app.
   base::FilePath versioned_dir = chrome::GetVersionedDirectory();
   base::FilePath outer_app_dir = versioned_dir.DirName().DirName().DirName();
   const char* outer_app_dir_c = outer_app_dir.value().c_str();
   NSString* outer_app_dir_ns = [NSString stringWithUTF8String:outer_app_dir_c];
 
   return [[NSBundle bundleWithPath:outer_app_dir_ns] retain];
 }
 #endif  // !defined(OS_IOS)
 
-const char* ProductDirNameInternal() {
+char* ProductDirNameInternal(NSBundle* chrome_bundle) {
   const char* product_dir_name = NULL;
 #if !defined(OS_IOS)
   base::mac::ScopedNSAutoreleasePool pool;
 
   // Use OuterAppBundle() to get the main app's bundle. This key needs to live

[jeremy, 2013/03/24 14:17:13]

Can you please update this comment?

[jeremya, 2013/04/01 23:30:22]

Moved it to where the call to OuterAppBundle went.

   // in the main app's bundle because it will be set differently on the canary
   // channel, and the autoupdate system dictates that there can be no
   // differences between channels within the versioned directory. This would
   // normally use base::mac::FrameworkBundle(), but that references the
   // framework bundle within the versioned directory. Ordinarily, the profile
   // should not be accessed from non-browser processes, but those processes do
   // attempt to get the profile directory, so direct them to look in the outer
   // browser .app's Info.plist for the CrProductDirName key.
-  NSBundle* bundle = chrome::OuterAppBundle();
   NSString* product_dir_name_ns =
-      [bundle objectForInfoDictionaryKey:@"CrProductDirName"];
+      [chrome_bundle objectForInfoDictionaryKey:@"CrProductDirName"];
   product_dir_name = [product_dir_name_ns fileSystemRepresentation];
 #endif
 
   if (!product_dir_name) {
 #if defined(GOOGLE_CHROME_BUILD)
     product_dir_name = "Google/Chrome";
 #else
     product_dir_name = "Chromium";
 #endif
   }
 
   // Leaked, but the only caller initializes a static with this result, so it
   // only happens once, and that's OK.
   return strdup(product_dir_name);
 }
 
 // ProductDirName returns the name of the directory inside
 // ~/Library/Application Support that should hold the product application
 // data. This can be overridden by setting the CrProductDirName key in the
 // outer browser .app's Info.plist. The default is "Google/Chrome" for
 // officially-branded builds, and "Chromium" for unbranded builds. For the
 // official canary channel, the Info.plist will have CrProductDirName set
 // to "Google/Chrome Canary".
 std::string ProductDirName() {
-  static const char* product_dir_name = ProductDirNameInternal();
+#if defined(OS_IOS)
+  static const char* product_dir_name = ProductDirNameInternal(nil);
+#else
+  static const char* product_dir_name =
+      ProductDirNameInternal(chrome::OuterAppBundle());
+#endif
   return std::string(product_dir_name);
 }
 
 }  // namespace
 
 namespace chrome {
 
-bool GetDefaultUserDataDirectory(base::FilePath* result) {
+bool GetDefaultUserDataDirectoryForProduct(const std::string& product_dir,

[Mark Mentovai, 2013/03/22 18:08:41]

This belongs in the anonymous namespace a few lines up.

[jeremya, 2013/04/01 23:30:22]

Done.

+                                           base::FilePath* result) {
   bool success = false;
   if (result && PathService::Get(base::DIR_APP_DATA, result)) {
-    *result = result->Append(ProductDirName());
+    *result = result->Append(product_dir);
     success = true;
   }
   return success;
 }
 
+bool GetDefaultUserDataDirectory(base::FilePath* result) {
+  return GetDefaultUserDataDirectoryForProduct(ProductDirName(), result);
+}
+
 bool GetUserDocumentsDirectory(base::FilePath* result) {
   return base::mac::GetUserDirectory(NSDocumentDirectory, result);
 }
 
 void GetUserCacheDirectory(const base::FilePath& profile_dir,
                            base::FilePath* result) {
   // If the profile directory is under ~/Library/Application Support,
   // use a suitable cache directory under ~/Library/Caches.  For
   // example, a profile directory of ~/Library/Application
   // Support/Google/Chrome/MyProfileName would use the cache directory
@@ skipping 89 matching lines @@
   return base::mac::GetLocalDirectory(NSApplicationSupportDirectory, result);
 }
 
 NSBundle* OuterAppBundle() {
   // Cache this. Foundation leaks it anyway, and this should be the only call
   // to OuterAppBundleInternal().
   static NSBundle* bundle = OuterAppBundleInternal();
   return bundle;
 }
 
+bool GetUserDataDirectoryForBundle(NSBundle* bundle, base::FilePath* result) {
+  char* product_dir_name = ProductDirNameInternal(bundle);

[Mark Mentovai, 2013/03/22 18:08:41]

I don’t like calling *Internal functions from something other than the
associated function that wraps it, because it’s messy. *Internal functions just
look like broken-off implementation details of the one function that they
support, and calling it directly from elsewhere can be a confusing pattern.

I can’t come up with a better way to restructure things, though. Notably, the
strdup thing is a royal pain that makes it a little more cumbersome, but we
can’t put a std::string into a static (or rely on anything about lifetimes of
const char*s we didn’t make ourselves), so we had to do it.

But maybe at least a rename of the “internal” function is in order now.
ProductDirNameForBundle?

[Mark Mentovai, 2013/03/22 18:08:41]

You can stick the result into a scoped_ptr_malloc which is a little more
self-documenting and makes sure the right thing happens if this function grows
to have early returns.

[jeremya, 2013/04/01 23:30:22]

Done.

[jeremya, 2013/04/01 23:30:22]

Done.

+  bool success =
+      GetDefaultUserDataDirectoryForProduct(product_dir_name, result);
+  // ProductDirNameInternal() returns a strdup()'d string, so clean it up here.
+  free(static_cast<void*>(product_dir_name));
+  return success;
+}
+
 #endif  // !defined(OS_IOS)
 
 bool ProcessNeedsProfileDir(const std::string& process_type) {
   // For now we have no reason to forbid this on other MacOS as we don't
   // have the roaming profile troubles there.
   return true;
 }
 
 }  // namespace chrome