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

trunk/src/chrome/browser/profiles/profile_list_desktop_browsertest.cc

 // Copyright (c) 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 "base/command_line.h"
 #include "base/path_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "content/public/test/test_utils.h"
 
 namespace {
@@ skipping 40 matching lines @@
   menu->RebuildMenu();
 
   BrowserList* browser_list =
       BrowserList::GetInstance(chrome::GetActiveDesktop());
   EXPECT_EQ(1U, browser_list->size());
   content::WindowedNotificationObserver window_close_observer(
       chrome::NOTIFICATION_BROWSER_CLOSED,
       content::Source<Browser>(browser()));
 
   EXPECT_FALSE(cache.ProfileIsSigninRequiredAtIndex(index));
-  profiles::LockProfile(current_profile);
+  menu->SetLogoutURL("about:blank");
+  menu->BeginSignOut();
   EXPECT_TRUE(cache.ProfileIsSigninRequiredAtIndex(index));
 
   window_close_observer.Wait();  // rely on test time-out for failure indication
   EXPECT_EQ(0U, browser_list->size());
 }
 
 IN_PROC_BROWSER_TEST_F(ProfileListDesktopBrowserTest, SwitchToProfile) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
@@ skipping 36 matching lines @@
   // Open a browser window for the second profile.
   menu->SwitchToProfile(cache.GetIndexOfProfileWithPath(path_profile2), false);
   EXPECT_EQ(2U, browser_list->size());
 
   // Switch to the first profile without opening a new window.
   menu->SwitchToProfile(cache.GetIndexOfProfileWithPath(path_profile1), false);
   EXPECT_EQ(2U, browser_list->size());
   EXPECT_EQ(path_profile1, browser_list->get(0)->profile()->GetPath());
   EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath());
 }