Cleanup and enable NewAvatarMenuEnabledInGuestMode test.

This test has been disabled for 5 years. Cleaning up a bit and giving it
a try before expanding to cover ephemeral Guest profiles.

Bug: 471953, 1125474
Change-Id: Ia97497052141aed270b70fd1452c25e23ca7a78b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2489884
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820208}

chrome/browser/ui/browser_command_controller_browsertest.cc

@@ -84,38 +84,20 @@ IN_PROC_BROWSER_TEST_F(BrowserCommandControllerBrowserTest, DisableFind) {
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FIND));
 }
 
-// Note that a Browser's destructor, when the browser's profile is guest, will
-// create and execute a BrowsingDataRemover.
-// Flakes http://crbug.com/471953
+// TODO(https://crbug.com/1125474): Expand to cover ChromeOS and ephemeral Guest
+// profiles.
+#if !defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(BrowserCommandControllerBrowserTest,
-                       DISABLED_NewAvatarMenuEnabledInGuestMode) {
+                       NewAvatarMenuEnabledInGuestMode) {
   EXPECT_EQ(1U, BrowserList::GetInstance()->size());
 
-  // Create a guest browser nicely. Using CreateProfile() and CreateBrowser()
-  // does incomplete initialization that would lead to
-  // SystemUrlRequestContextGetter being leaked.
-  profiles::SwitchToGuestProfile(ProfileManager::CreateCallback());
-  ui_test_utils::WaitForBrowserToOpen();
-  EXPECT_EQ(2U, BrowserList::GetInstance()->size());
-
-  // Access the browser that was created for the new Guest Profile.
-  Profile* guest = g_browser_process->profile_manager()->GetProfileByPath(
-      ProfileManager::GetGuestProfilePath());
-  Browser* browser = chrome::FindAnyBrowser(guest, true);
+  Browser* browser = CreateGuestBrowser();
   EXPECT_TRUE(browser);
 
-  // The BrowsingDataRemover needs a loaded TemplateUrlService or else it hangs
-  // on to a CallbackList::Subscription forever.
-  TemplateURLServiceFactory::GetForProfile(guest)->set_loaded(true);
-
   const CommandUpdater* command_updater = browser->command_controller();
-#if defined(OS_CHROMEOS)
-  // Chrome OS uses system tray menu to handle multi-profiles.
-  EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
-#else
   EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
-#endif
 }
+#endif
 
 #if defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(BrowserCommandControllerBrowserTest, LockedFullscreen) {