[mac] App shims

chrome/browser/browser_process_impl.cc

Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 6dfde519f06e03f01324c30962f7efc663a25d57..8b8d29eac5f5c010d3665e986ae428c2ab60528a 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -120,6 +120,10 @@
 #include "chrome/browser/plugins/plugins_resource_service.h"
 #endif
 
+#if defined(OS_MACOSX)
+#include "apps/app_shim/app_shim_host_controller.h"
+#endif
+
 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
 // How often to check if the persistent instance of Chrome needs to restart
 // to install an update.
@@ -266,6 +270,10 @@ void BrowserProcessImpl::StartTearDown() {
   // monitor information.
   aura::Env::DeleteInstance();
 #endif
+
+#if defined(OS_MACOSX)
+  app_shim_host_controller_.reset();
+#endif
 }
 
 void BrowserProcessImpl::PostDestroyThreads() {
@@ -896,6 +904,10 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
     bookmark_prompt_controller_.reset(new BookmarkPromptController());
   }
 #endif
+
+#if defined(OS_MACOSX)
+  app_shim_host_controller_.reset(new AppShimHostController);
+#endif
 }
 
 void BrowserProcessImpl::CreateIconManager() {