Index: chrome/browser/profiles/profile_list_desktop_browsertest.cc |
diff --git a/chrome/browser/profiles/profile_list_desktop_browsertest.cc b/chrome/browser/profiles/profile_list_desktop_browsertest.cc |
index 65a0b2fdbcbc18d2155e57466a823e08e980e08f..e87bdf1c851fcecdf8085ed13824ca77a85646c6 100644 |
--- a/chrome/browser/profiles/profile_list_desktop_browsertest.cc |
+++ b/chrome/browser/profiles/profile_list_desktop_browsertest.cc |
@@ -34,13 +34,8 @@ class ProfileListDesktopBrowserTest : public InProcessBrowserTest { |
public: |
ProfileListDesktopBrowserTest() {} |
- AvatarMenu* GetAvatarMenu(ProfileInfoCache* cache) { |
- // Reset the menu. |
- avatar_menu_.reset(new AvatarMenu( |
- cache, |
- NULL, |
- browser())); |
- return avatar_menu_.get(); |
+ scoped_ptr<AvatarMenu> CreateAvatarMenu(ProfileInfoCache* cache) { |
+ return scoped_ptr<AvatarMenu>(new AvatarMenu(cache, NULL, browser())); |
} |
private: |
@@ -68,7 +63,7 @@ IN_PROC_BROWSER_TEST_F(ProfileListDesktopBrowserTest, MAYBE_SignOut) { |
ProfileInfoCache& cache = profile_manager->GetProfileInfoCache(); |
size_t index = cache.GetIndexOfProfileWithPath(current_profile->GetPath()); |
- AvatarMenu* menu = GetAvatarMenu(&cache); |
+ scoped_ptr<AvatarMenu> menu = CreateAvatarMenu(&cache); |
menu->RebuildMenu(); |
BrowserList* browser_list = |
@@ -125,7 +120,7 @@ IN_PROC_BROWSER_TEST_F(ProfileListDesktopBrowserTest, MAYBE_SwitchToProfile) { |
content::RunMessageLoop(); |
ASSERT_EQ(cache.GetNumberOfProfiles(), 2U); |
- AvatarMenu* menu = GetAvatarMenu(&cache); |
+ scoped_ptr<AvatarMenu> menu = CreateAvatarMenu(&cache); |
menu->RebuildMenu(); |
BrowserList* browser_list = |
BrowserList::GetInstance(chrome::GetActiveDesktop()); |