Mac: Generate App Mode Loader bundle + cleanup

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 b32ae3146f730a55b9a0d10aa65023d45d8d1bc2..043f87fd21fa1ffca22fd9c93107c1444341e88e 100644
--- a/chrome/app/chrome_main_app_mode_mac.mm
+++ b/chrome/app/chrome_main_app_mode_mac.mm
@@ -13,6 +13,8 @@
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
+#include "base/mac/bundle_locations.h"
+#include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/mac/app_mode_common.h"
@@ -43,9 +45,13 @@ int ChromeAppModeStart(const app_mode::ChromeAppModeInfo* info) {
   FilePath* chrome_versioned_path = new FilePath(info->chrome_versioned_path);
   RAW_CHECK(!chrome_versioned_path->empty());
   chrome::SetOverrideVersionedDirectory(chrome_versioned_path);
+  base::mac::SetOverrideOuterBundlePath(info->chrome_outer_bundle_path);
+  base::mac::SetOverrideFrameworkBundlePath(
+      chrome_versioned_path->Append(chrome::kFrameworkName));
 
   CommandLine command_line(CommandLine::NO_PROGRAM);
   command_line.AppendSwitch(info->argv[0]);
+
   RAW_CHECK(info->app_mode_id.size());
   command_line.AppendSwitchASCII(switches::kAppId, info->app_mode_id);
   command_line.AppendSwitchPath(switches::kUserDataDir, info->user_data_dir);