Fix Profile* lifetime issues in Chrome's AppListViewDelegate

chrome/browser/ui/ash/chrome_shell_delegate.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/ash/chrome_shell_delegate.h"
 
 #include "apps/app_window.h"
 #include "apps/app_window_registry.h"
 #include "ash/content_support/gpu_support_impl.h"
 #include "ash/magnifier/magnifier_constants.h"
@@ skipping 89 matching lines @@
 content::BrowserContext* ChromeShellDelegate::GetActiveBrowserContext() {
 #if defined(OS_CHROMEOS)
   DCHECK(user_manager::UserManager::Get()->GetLoggedInUsers().size());
 #endif
   return ProfileManager::GetActiveUserProfile();
 }
 
 app_list::AppListViewDelegate*
 ChromeShellDelegate::CreateAppListViewDelegate() {
   DCHECK(ash::Shell::HasInstance());
-  // Shell will own the created delegate, and the delegate will own
-  // the controller.
-  return new AppListViewDelegate(
-      Profile::FromBrowserContext(GetActiveBrowserContext()),
-      AppListService::Get(chrome::HOST_DESKTOP_TYPE_ASH)->
-      GetControllerDelegate());
+  // Shell will own the created delegate (transitively via app list).
+  // Ownership of the controller delegate remains with the AppListService.
+  AppListControllerDelegate* controller_delegate =
+      AppListService::Get(chrome::HOST_DESKTOP_TYPE_ASH)
+          ->GetControllerDelegate();
+  AppListViewDelegate* view_delegate =
+      new AppListViewDelegate(controller_delegate);
+  view_delegate->SetProfile(
+      Profile::FromBrowserContext(GetActiveBrowserContext()));
+  return view_delegate;
 }
 
 ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate(
     ash::ShelfModel* model) {
   if (!shelf_delegate_) {
     shelf_delegate_ = ChromeLauncherController::CreateInstance(NULL, model);
     shelf_delegate_->Init();
   }
   return shelf_delegate_;
 }
@@ skipping 35 matching lines @@
 
 void ChromeShellDelegate::AddVirtualKeyboardStateObserver(
     ash::VirtualKeyboardStateObserver* observer) {
   keyboard_state_observer_list_.AddObserver(observer);
 }
 
 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver(
     ash::VirtualKeyboardStateObserver* observer) {
   keyboard_state_observer_list_.RemoveObserver(observer);
 }