Revert 235801 "Fix crash when locking a profile. The crash is ha..."

trunk/src/chrome/browser/ui/views/profile_chooser_view.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/ui/views/profile_chooser_view.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_info_util.h"
@@ skipping 422 matching lines @@
       ProfileOAuth2TokenServiceFactory::GetForProfile(browser_->profile());
   if (oauth2_token_service)
     oauth2_token_service->RevokeCredentials(match->second);
 }
 
 void ProfileChooserView::LinkClicked(views::Link* sender, int event_flags) {
   if (sender == manage_accounts_link_) {
     // ShowView() will DCHECK if this view is displayed for non signed-in users.
     ShowView(ACCOUNT_MANAGEMENT_VIEW, avatar_menu_.get());
   } else if (sender == signout_current_profile_link_) {
-    profiles::LockProfile(browser_->profile());
+    avatar_menu_->BeginSignOut();
   } else if (sender == signin_current_profile_link_) {
     if (CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableInlineSignin)) {
       ShowView(GAIA_SIGNIN_VIEW, avatar_menu_.get());
     } else {
       GURL page = signin::GetPromoURL(signin::SOURCE_MENU, false);
       chrome::ShowSingletonTab(browser_, page);
     }
   } else {
     DCHECK(sender == change_photo_link_);
@@ skipping 234 matching lines @@
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   add_account_button_ = new views::BlueButton(
       this,
       l10n_util::GetStringFUTF16(IDS_PROFILES_PROFILE_ADD_ACCOUNT_BUTTON,
                                  avatar_item.name));
   layout->StartRow(1, 0);
   layout->AddView(add_account_button_);
   return view;
 }