Redesign of the avatar menu button.

chrome/browser/ui/views/avatar_menu_button_browsertest.cc

Index: chrome/browser/ui/views/avatar_menu_button_browsertest.cc
diff --git a/chrome/browser/ui/views/avatar_menu_button_browsertest.cc b/chrome/browser/ui/views/avatar_menu_button_browsertest.cc
index a3c01250caacef69479aa69063f6c0b6ba4e3fa1..02f5cb33e84f51f8ed59e03ef65e4199dc7dff34 100644
--- a/chrome/browser/ui/views/avatar_menu_button_browsertest.cc
+++ b/chrome/browser/ui/views/avatar_menu_button_browsertest.cc
@@ -7,35 +7,24 @@
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.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/profiles_state.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
-#include "chrome/browser/ui/views/profile_chooser_view.h"
-#include "chrome/browser/ui/views/user_manager_view.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.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"
 #include "grit/generated_resources.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/views/controls/button/label_button.h"
 
-class AvatarMenuButtonTest : public InProcessBrowserTest,
-                             public testing::WithParamInterface<bool> {
+class AvatarMenuButtonTest : public InProcessBrowserTest {
  public:
   AvatarMenuButtonTest();
   virtual ~AvatarMenuButtonTest();
 
  protected:
-  virtual void SetUp() OVERRIDE;
-
-  bool UsingNewProfileChooser();
   void CreateTestingProfile();
   AvatarMenuButton* GetAvatarMenuButton();
   void StartAvatarMenu();
@@ -50,33 +39,10 @@ AvatarMenuButtonTest::AvatarMenuButtonTest() {
 AvatarMenuButtonTest::~AvatarMenuButtonTest() {
 }
 
-void AvatarMenuButtonTest::SetUp() {
-  if (GetParam()) {
-    if (!UsingNewProfileChooser()) {
-      CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kNewProfileManagement);
-    }
-    DCHECK(UsingNewProfileChooser());
-  } else {
-    DCHECK(!UsingNewProfileChooser());
-  }
-
-  InProcessBrowserTest::SetUp();
-}
-
-bool AvatarMenuButtonTest::UsingNewProfileChooser() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-    switches::kNewProfileManagement);
-}
-
 void AvatarMenuButtonTest::CreateTestingProfile() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   EXPECT_EQ(1u, profile_manager->GetNumberOfProfiles());
 
-  // Sign in the default profile
-  ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
-  cache.SetUserNameOfProfileAtIndex(0, UTF8ToUTF16("user_name"));
-
   base::FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
   path = path.AppendASCII("test_profile");
@@ -99,28 +65,25 @@ void AvatarMenuButtonTest::StartAvatarMenu() {
   ASSERT_TRUE(button);
 
   AvatarMenuBubbleView::set_close_on_deactivate(false);
-  ProfileChooserView::set_close_on_deactivate(false);
   static_cast<views::MenuButtonListener*>(button)->OnMenuButtonClicked(
       NULL, gfx::Point());
   base::MessageLoop::current()->RunUntilIdle();
-  EXPECT_NE(AvatarMenuBubbleView::IsShowing(),
-            ProfileChooserView::IsShowing());
+  EXPECT_TRUE(AvatarMenuBubbleView::IsShowing());
 }
 
-IN_PROC_BROWSER_TEST_P(AvatarMenuButtonTest, HideOnSecondClick) {
+IN_PROC_BROWSER_TEST_F(AvatarMenuButtonTest, HideOnSecondClick) {
 #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))
     return;
 #endif
 
-  if (!profiles::IsMultipleProfilesEnabled() ||
-      UsingNewProfileChooser()) {
+  // If multiprofile mode is not enabled, you can't switch between profiles.
+  if (!profiles::IsMultipleProfilesEnabled())
     return;
-  }
 
   CreateTestingProfile();
-  StartAvatarMenu();
+  ASSERT_NO_FATAL_FAILURE(StartAvatarMenu());
 
   // Verify that clicking again doesn't reshow it.
   AvatarMenuButton* button = GetAvatarMenuButton();
@@ -131,44 +94,4 @@ IN_PROC_BROWSER_TEST_P(AvatarMenuButtonTest, HideOnSecondClick) {
   AvatarMenuBubbleView::Hide();
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_FALSE(AvatarMenuBubbleView::IsShowing());
-  EXPECT_FALSE(ProfileChooserView::IsShowing());
-}
-
-IN_PROC_BROWSER_TEST_P(AvatarMenuButtonTest, NewSignOut) {
-  if (!profiles::IsMultipleProfilesEnabled() ||
-      !UsingNewProfileChooser()) {
-    return;
-  }
-
-  CreateTestingProfile();
-  StartAvatarMenu();
-
-  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()));
-
-  AvatarMenu* menu =
-      ProfileChooserView::profile_bubble_->avatar_menu_.get();
-  const AvatarMenu::Item& menu_item_before =
-      menu->GetItemAt(menu->GetActiveProfileIndex());
-  EXPECT_FALSE(menu_item_before.signin_required);
-
-  ui::MouseEvent mouse_ev(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), 0);
-  menu->SetLogoutURL("about:blank");
-
-  ProfileChooserView::profile_bubble_->LinkClicked(
-      static_cast<views::Link*>(
-          ProfileChooserView::profile_bubble_->signout_current_profile_link_),
-      0);
-
-  EXPECT_TRUE(menu->GetItemAt(menu->GetActiveProfileIndex()).signin_required);
-
-  window_close_observer.Wait();  // Rely on test timeout for failure indication.
-  EXPECT_TRUE(browser_list->empty());
 }
-
-INSTANTIATE_TEST_CASE_P(Old, AvatarMenuButtonTest, testing::Values(false));
-INSTANTIATE_TEST_CASE_P(New, AvatarMenuButtonTest, testing::Values(true));