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

chrome/app/chrome_main_app_mode_mac.mm

Index: chrome/app/chrome_main_app_mode_mac.mm
diff --git a/chrome/app/chrome_main_app_mode_mac.mm b/chrome/app/chrome_main_app_mode_mac.mm
index e7ab65a7ee315ec071a35820fc5352470ebc9c32..7c5ca001111b876baca746cdae456c5a8777b9ac 100644
--- a/chrome/app/chrome_main_app_mode_mac.mm
+++ b/chrome/app/chrome_main_app_mode_mac.mm
@@ -19,7 +19,7 @@
 #include "base/path_service.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/thread.h"
-#include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/mac/app_mode_common.h"
 #include "ipc/ipc_channel_proxy.h"
@@ -68,11 +68,16 @@ AppShimController::AppShimController() : channel_(NULL) {
 
 void AppShimController::Init() {
   DCHECK(g_io_thread);
+  NSString* chrome_bundle_path =
+      base::SysUTF8ToNSString(g_info->chrome_outer_bundle_path.value());
+  NSBundle* chrome_bundle = [NSBundle bundleWithPath:chrome_bundle_path];
   base::FilePath user_data_dir;
-  if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) {
+  if (!chrome::GetUserDataDirectoryForBrowserBundle(

[Mark Mentovai, 2013/04/03 17:52:01]

This kind of thing reads a tiny bit better formatted as

  if (!chrome::GetUserDataDirectoryForBrowserBundle(chrome_bundle,
                                                    &user_data_dir)) {

with the arguments lined up, don’t you agree?

+          chrome_bundle, &user_data_dir)) {
     Quit();
     return;
   }
+
   base::FilePath socket_path =
       user_data_dir.Append(app_mode::kAppShimSocketName);
   IPC::ChannelHandle handle(socket_path.value());