[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 1cafe996be18fae323c27bae09c2a6c2b2a8e84d..ec4094a4f49e7271c8040f45f2498654f0409a3d 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -119,6 +119,10 @@
 #include "chrome/browser/plugins/plugins_resource_service.h"
 #endif
 
+#if defined(OS_MACOSX)
+#include "chrome/browser/web_applications/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.
@@ -265,6 +269,10 @@ void BrowserProcessImpl::StartTearDown() {
   // monitor information.
   aura::Env::DeleteInstance();
 #endif
+
+#if defined(OS_MACOSX)
+  app_shim_host_controller_.reset();
+#endif
 }
 
 void BrowserProcessImpl::PostDestroyThreads() {
@@ -888,6 +896,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() {