Use the shim bundle's user_data_dir instead of GetUserDataDirectoryForBrowserBundle.

apps/app_shim/chrome_main_app_mode_mac.mm

 // Copyright 2013 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.
 
 // On Mac, one can't make shortcuts with command-line arguments. Instead, we
 // produce small app bundles which locate the Chromium framework and load it,
 // passing the appropriate data. This is the entry point into the framework for
 // those app bundles.
 
 #import <Cocoa/Cocoa.h>
 
 #include "apps/app_shim/app_shim_messages.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/mac/launch_services_util.h"
 #include "base/mac/mac_logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/message_loop.h"
 #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"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_message.h"
 
 namespace {
 
 const app_mode::ChromeAppModeInfo* g_info;
 base::Thread* g_io_thread = NULL;
@@ skipping 53 matching lines @@
   bool launch_app_done_;
 
   DISALLOW_COPY_AND_ASSIGN(AppShimController);
 };
 
 AppShimController::AppShimController() : channel_(NULL),
                                          launch_app_done_(false) {}
 
 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 (!chrome::GetUserDataDirectoryForBrowserBundle(chrome_bundle,

[tapted, 2013/07/17 08:34:21]

I started wondering whether this approach was chosen because it gives a stronger
guarantee that "this" running chrome_main_app_mode_mac.mm process, and the
Chrome process it tries to connect to, will come from the same release.

E.g. if the IPC protocol changes between releases, does this change increase the
chance that it could find and connect to a Chrome talking a different language.

But I think that's actually not the case.

[jackhou1, 2013/07/30 07:34:34]

The Info.plist has Chrome's bundle id, which app_mode_loader uses to find the
framework bundle. So I think you're guaranteed to use the same version is if
there's only one app bundle with that id, and you don't share user_data_dirs
between different app bundles.

-                                                    &user_data_dir)) {
+  if (g_info->user_data_dir.empty()) {

[tapted, 2013/07/17 08:34:21]

Can a shim ever be created like this? Maybe just CHECK, and ditch the early
Close().

[jackhou1, 2013/07/30 07:34:34]

Done.

     Close();
     return;
   }
 
-  base::FilePath socket_path =
-      user_data_dir.Append(app_mode::kAppShimSocketName);
+  base::FilePath socket_path;
+  base::FilePath maybe_profile_dir =

[tapted, 2013/07/17 08:34:21]

Perhaps a helper function, which describes the logic here in some comments..

[jackhou1, 2013/07/30 07:34:34]

Since we're not changing the user_data_dir field, this logic is much simpler.

+      g_info->user_data_dir.DirName().DirName().BaseName();
+  if (maybe_profile_dir == g_info->profile_dir)

[tapted, 2013/07/17 08:34:21]

What happens if someone's Chrome user data dir is two levels below some random
folder called 'Default'?

[jackhou1, 2013/07/30 07:34:34]

Obsolete since we're leaving the user_data_dir unchanged for now.

+    socket_path = g_info->user_data_dir.DirName().DirName().DirName();
+  else
+    socket_path = g_info->user_data_dir;
+
+  socket_path = socket_path.Append(app_mode::kAppShimSocketName);
   IPC::ChannelHandle handle(socket_path.value());
   channel_ = new IPC::ChannelProxy(handle, IPC::Channel::MODE_NAMED_CLIENT,
       this, g_io_thread->message_loop_proxy().get());
 
   channel_->Send(new AppShimHostMsg_LaunchApp(
       g_info->profile_dir, g_info->app_mode_id,
       CommandLine::ForCurrentProcess()->HasSwitch(app_mode::kNoLaunchApp) ?
           apps::APP_SHIM_LAUNCH_REGISTER_ONLY : apps::APP_SHIM_LAUNCH_NORMAL));
 
   nsapp_delegate_.reset([[AppShimDelegate alloc] initWithController:this]);
@@ skipping 276 matching lines @@
   // fully initialized don't receive a reply until its run loop starts. Once
   // the reply is received, Chrome will have opened its IPC port, guaranteed.
   [ReplyEventHandler pingProcess:psn andCall:base::Bind(&OnPingChromeReply)];
 
   base::MessageLoopForUI main_message_loop;
   main_message_loop.set_thread_name("MainThread");
   base::PlatformThread::SetName("CrAppShimMain");
   main_message_loop.Run();
   return 0;
 }