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

trunk/src/chrome/browser/profiles/avatar_menu.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROFILES_AVATAR_MENU_H_
 #define CHROME_BROWSER_PROFILES_AVATAR_MENU_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 110 matching lines @@
   base::string16 GetManagedUserInformation() const;
 
   // Returns the icon for the managed user which will be displayed in the
   // avatar menu.
   const gfx::Image& GetManagedUserIcon() const;
 
   // This menu is also used for the always-present Mac system menubar. If the
   // last active browser changes, the menu will need to reference that browser.
   void ActiveBrowserChanged(Browser* browser);
 
+  // Start the sign-out process for this profile.
+  content::WebContents* BeginSignOut();
+
+  // Use a different URL for logout (for testing only).
+  void SetLogoutURL(const std::string& logout_url);
+
   // Returns true if the add profile link should be shown.
   bool ShouldShowAddNewProfileLink() const;
 
   // Returns true if the edit profile link should be shown.
   bool ShouldShowEditProfileLink() const;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
@@ skipping 14 matching lines @@
   // Browser in which this avatar menu resides. Weak.
   Browser* browser_;
 
   // Listens for notifications from the ProfileInfoCache.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(AvatarMenu);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_AVATAR_MENU_H_