Don't look up profiles when closing shims.

apps/app_shim/extension_app_shim_handler_mac.cc

 // 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.
 
 #include "apps/app_shim/extension_app_shim_handler_mac.h"
 
 #include "apps/app_lifetime_monitor_factory.h"
 #include "apps/app_shim/app_shim_messages.h"
 #include "apps/shell_window.h"
 #include "base/files/file_path.h"
@@ skipping 44 matching lines @@
   base::FilePath full_path = profile_manager->user_data_dir().Append(path);
   ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
   return cache.GetIndexOfProfileWithPath(full_path) != std::string::npos;
 }
 
 Profile* ExtensionAppShimHandler::Delegate::ProfileForPath(
     const base::FilePath& path) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   base::FilePath full_path = profile_manager->user_data_dir().Append(path);
   Profile* profile = profile_manager->GetProfileByPath(full_path);
-  if (!profile)
-    return NULL;
 
   // Use IsValidProfile to check if the profile has been created.
-  return profile_manager->IsValidProfile(profile) ? profile : NULL;
+  return profile && profile_manager->IsValidProfile(profile) ? profile : NULL;
 }
 
 void ExtensionAppShimHandler::Delegate::LoadProfileAsync(
     const base::FilePath& path,
     base::Callback<void(Profile*)> callback) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   base::FilePath full_path = profile_manager->user_data_dir().Append(path);
   profile_manager->CreateProfileAsync(
       full_path,
       base::Bind(&ProfileLoadedCallback, callback),
@@ skipping 123 matching lines @@
 
   // TODO(jeremya): Handle the case that launching the app fails. Probably we
   // need to watch for 'app successfully launched' or at least 'background page
   // exists/was created' and time out with failure if we don't see that sign of
   // life within a certain window.
   if (launch_type == APP_SHIM_LAUNCH_NORMAL)
     delegate_->LaunchApp(profile, extension);
 }
 
 void ExtensionAppShimHandler::OnShimClose(Host* host) {
-  DCHECK(delegate_->ProfileExistsForPath(host->GetProfilePath()));
-  Profile* profile = delegate_->ProfileForPath(host->GetProfilePath());
-
-  HostMap::iterator it = hosts_.find(make_pair(profile, host->GetAppId()));
-  // Any hosts other than the main host will still call OnShimClose, so ignore
-  // them.
-  if (it != hosts_.end() && it->second == host)
-    hosts_.erase(it);
+  // This might be called when shutting down. Don't try to look up the profile
+  // since profile_manager might not be around.
+  for (HostMap::iterator it = hosts_.begin(); it != hosts_.end(); ) {
+    HostMap::iterator current = it++;
+    if (current->second == host)
+      hosts_.erase(current);
+  }
 }
 
 void ExtensionAppShimHandler::OnShimFocus(Host* host,
                                           AppShimFocusType focus_type) {
   DCHECK(delegate_->ProfileExistsForPath(host->GetProfilePath()));
   Profile* profile = delegate_->ProfileForPath(host->GetProfilePath());
 
   const ShellWindowList windows =
       delegate_->GetWindows(profile, host->GetAppId());
   std::set<gfx::NativeWindow> native_windows;
@@ skipping 125 matching lines @@
 
 void ExtensionAppShimHandler::OnAppDeactivated(Profile* profile,
                                                const std::string& app_id) {}
 
 void ExtensionAppShimHandler::OnAppStop(Profile* profile,
                                         const std::string& app_id) {}
 
 void ExtensionAppShimHandler::OnChromeTerminating() {}
 
 }  // namespace apps