Put app shim IPC socket in a temporary directory. (Mac)

apps/app_shim/app_shim_host_manager_mac.mm

Index: apps/app_shim/app_shim_host_manager_mac.mm
diff --git a/apps/app_shim/app_shim_host_manager_mac.mm b/apps/app_shim/app_shim_host_manager_mac.mm
index eeaa114adea0e03b5921483ca98379a4ffeee43b..ed3f92e020aef907ce4c24a82c3edd3d4f264b6d 100644
--- a/apps/app_shim/app_shim_host_manager_mac.mm
+++ b/apps/app_shim/app_shim_host_manager_mac.mm
@@ -8,6 +8,7 @@
 #include "apps/app_shim/app_shim_host_mac.h"
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ -15,7 +16,6 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/mac/app_mode_common.h"
-#include "ipc/unix_domain_socket_util.h"
 
 using content::BrowserThread;
 
@@ -28,8 +28,6 @@ void CreateAppShimHost(const IPC::ChannelHandle& handle) {
 
 }  // namespace
 
-const base::FilePath* AppShimHostManager::g_override_user_data_dir_ = NULL;
-
 AppShimHostManager::AppShimHostManager() {}
 
 void AppShimHostManager::Init() {
@@ -42,28 +40,26 @@ void AppShimHostManager::Init() {
 
 AppShimHostManager::~AppShimHostManager() {
   apps::AppShimHandler::SetDefaultHandler(NULL);
+  // This is destroyed on the UI thread, but only during shutdown.
+  if (!directory_created_in_tmp_.empty())
+    base::DeleteFile(directory_created_in_tmp_, true);
 }
 
 void AppShimHostManager::InitOnFileThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   base::FilePath user_data_dir;
-  if (g_override_user_data_dir_) {
-    user_data_dir = *g_override_user_data_dir_;
-  } else if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) {
-    LOG(ERROR) << "Couldn't get user data directory while creating App Shim "
-               << "Host manager.";
+  if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
     return;
-  }
 
-  base::FilePath socket_path =
-      user_data_dir.Append(app_mode::kAppShimSocketName);
-  // This mirrors a check in unix_domain_socket_util.cc which will guarantee
-  // failure and spam log files on bots because they have deeply nested paths to
-  // |user_data_dir| when swarming. See http://crbug.com/240554. Shim tests that
-  // run on the bots must override the path using AppShimHostManagerTestApi.
-  if (socket_path.value().length() >= IPC::kMaxSocketNameLength &&
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
-    return;
+  // The socket path must be shorter than 128 chars (IPC::kMaxSocketNameLength).
+  // To accommodate this, we use a short path in /tmp/ that is generated from a
+  // hash of the user data dir.
+  base::FilePath socket_path = app_mode::GetShortSocketPath(user_data_dir);
+  if (file_util::CreateDirectory(socket_path.DirName())) {

[tapted, 2013/11/22 05:04:31]

pretty sure this succeeds if the directory already exists (but it might not be
writable)

[jackhou1, 2013/11/22 05:51:03]

Done.

+    directory_created_in_tmp_ = socket_path.DirName();
+  } else {

[tapted, 2013/11/22 05:04:31]

(so I think this line can be removed)

[jackhou1, 2013/11/22 05:51:03]

Done.

+    if (!base::PathIsWritable(socket_path.DirName()))
+      return;
   }
 
   factory_.reset(new IPC::ChannelFactory(socket_path, this));