Fix crash when locking a profile.

chrome/browser/profiles/avatar_menu_actions_desktop.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 "chrome/browser/profiles/avatar_menu_actions_desktop.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
@@ skipping 102 matching lines @@
 
 bool AvatarMenuActionsDesktop::ShouldShowAddNewProfileLink() const {
   // |browser_| can be NULL in unit_tests.
   return !browser_ || !browser_->profile()->IsManaged();
 }
 
 bool AvatarMenuActionsDesktop::ShouldShowEditProfileLink() const {
   return true;
 }
 
-content::WebContents* AvatarMenuActionsDesktop::BeginSignOut() {
+void AvatarMenuActionsDesktop::BeginSignOut() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   Profile* current_profile = browser_->profile();
 
   ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
   size_t index = cache.GetIndexOfProfileWithPath(current_profile->GetPath());
   cache.SetProfileSigninRequiredAtIndex(index, true);
 
-  std::string landing_url = signin::GetLandingURL("close", 1).spec();
-  GURL logout_url(GaiaUrls::GetInstance()->service_logout_url());
-  logout_url = net::AppendQueryParameter(logout_url, "continue", landing_url);
-  if (!logout_override_.empty()) {
-    // We're testing...
-    landing_url = logout_override_;
-    logout_url = GURL(logout_override_);
+  if (profiles::IsNewProfileManagementEnabled()) {

[Roger Tawa OOO till Jul 10th, 2013/11/12 15:27:49]

nit: do we need this if?  I assume this function can only be called if new
profile management is enabled?

[noms (inactive), 2013/11/12 16:47:27]

Changed to a DCHECK. It can technically be called without enabling the flag; it
just shouldn't be.

On 2013/11/12 15:27:49, Roger Tawa wrote:

+      DCHECK(current_profile);
+      chrome::ShowUserManager(current_profile->GetPath());
   }
 
-  content::WebContents::CreateParams create_params(current_profile);
-  create_params.site_instance =
-      content::SiteInstance::CreateForURL(current_profile, logout_url);
-  content::WebContents* contents = content::WebContents::Create(create_params);
-  // This object may be destructed when the menu closes but we need something
-  // around to finish the sign-out process and close the profile windows.
-  new SignoutTracker(current_profile,
-                     GURL(landing_url),
-                     contents,
-                     browser_);
-  contents->GetController().LoadURL(
-    logout_url, content::Referrer(),
-    content::PAGE_TRANSITION_GENERATED, std::string());
-
-  return contents;  // returned for testing purposes
-}
-
-void AvatarMenuActionsDesktop::SetLogoutURL(const std::string& logout_url) {
-  logout_override_ = logout_url;
+  BrowserList::CloseAllBrowsersWithProfile(current_profile);
 }
 
 void AvatarMenuActionsDesktop::ActiveBrowserChanged(Browser* browser) {
   browser_ = browser;
 }