Fix SpeechUIModel lifetime issue in Chrome's AppListViewDelegate when switching profiles

chrome/browser/ui/app_list/app_list_view_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/app_list/app_list_view_delegate.h"
 
 #include <vector>
 
 #include "apps/custom_launcher_page_contents.h"
 #include "base/callback.h"
@@ skipping 155 matching lines @@
        ++i) {
     SigninManagerBase* manager =
         SigninManagerFactory::GetForProfileIfExists(*i);
     if (manager) {
       DCHECK(!scoped_observer_.IsObserving(manager));
       scoped_observer_.Add(manager);
     }
   }
 
   profile_manager->GetProfileInfoCache().AddObserver(this);
+  speech_ui_.reset(new app_list::SpeechUIModel);
+
+#if defined(GOOGLE_CHROME_BUILD)
+  speech_ui_->set_logo(
+      *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          IDR_APP_LIST_GOOGLE_LOGO_VOICE_SEARCH));
+#endif
   SetProfile(profile);
 }
 
 AppListViewDelegate::~AppListViewDelegate() {
   SetProfile(NULL);
   g_browser_process->profile_manager()->GetProfileInfoCache().RemoveObserver(
       this);
 
   SigninManagerFactory* factory = SigninManagerFactory::GetInstance();
   if (factory)
     factory->RemoveObserver(this);
 }
 
 void AppListViewDelegate::SetProfile(Profile* new_profile) {
   if (profile_) {
     // Note: |search_controller_| has a reference to |speech_ui_| so must be
     // destroyed first.
     search_controller_.reset();
-    speech_ui_.reset();
     custom_page_contents_.clear();
     app_list::StartPageService* start_page_service =
         app_list::StartPageService::Get(profile_);
     if (start_page_service)
       start_page_service->RemoveObserver(this);
 #if defined(USE_ASH)
     app_sync_ui_state_watcher_.reset();
 #endif
     model_ = NULL;
   }
 
   profile_ = new_profile;
-  if (!profile_)
+  if (!profile_) {
+    speech_ui_->SetSpeechRecognitionState(app_list::SPEECH_RECOGNITION_OFF);
     return;
+  }
 
   model_ =
       app_list::AppListSyncableServiceFactory::GetForProfile(profile_)->model();
 
 #if defined(USE_ASH)
   app_sync_ui_state_watcher_.reset(new AppSyncUIStateWatcher(profile_, model_));
 #endif
 
   SetUpSearchUI();
   SetUpProfileSwitcher();
   SetUpCustomLauncherPages();
 
   // Clear search query.
   model_->search_box()->SetText(base::string16());
 }
 
 void AppListViewDelegate::SetUpSearchUI() {
   app_list::StartPageService* start_page_service =
       app_list::StartPageService::Get(profile_);
   if (start_page_service)
     start_page_service->AddObserver(this);
 
-  speech_ui_.reset(new app_list::SpeechUIModel(
-      start_page_service ? start_page_service->state()
-                         : app_list::SPEECH_RECOGNITION_OFF));
-
-#if defined(GOOGLE_CHROME_BUILD)
-  speech_ui_->set_logo(
-      *ui::ResourceBundle::GetSharedInstance().
-      GetImageSkiaNamed(IDR_APP_LIST_GOOGLE_LOGO_VOICE_SEARCH));
-#endif
+  speech_ui_->SetSpeechRecognitionState(start_page_service
+                                            ? start_page_service->state()
+                                            : app_list::SPEECH_RECOGNITION_OFF);
 
   search_controller_.reset(new app_list::SearchController(profile_,
                                                           model_->search_box(),
                                                           model_->results(),
                                                           speech_ui_.get(),
                                                           controller_));
 }
 
 void AppListViewDelegate::SetUpProfileSwitcher() {
   // Don't populate the app list users if we are on the ash desktop.
@@ skipping 364 matching lines @@
 
 void AppListViewDelegate::AddObserver(
     app_list::AppListViewDelegateObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void AppListViewDelegate::RemoveObserver(
     app_list::AppListViewDelegateObserver* observer) {
   observers_.RemoveObserver(observer);
 }