Start untangling the avatar switcher from BrowserNonClientFrameView

chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc

Index: chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc
index 27cccf715eee51aa2ff13ab9a212b7093f9f8c22..798d1be47d9bf6a9d6a3a24529e6d4f4c9fbf656 100644
--- a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc
@@ -22,7 +22,6 @@
 #include "chrome/browser/ui/user_manager.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
-#include "chrome/browser/ui/views/profiles/new_avatar_button.h"
 #include "chrome/browser/ui/views/profiles/user_manager_view.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ -118,7 +117,7 @@ class ProfileChooserViewExtensionsTest : public ExtensionBrowserTest {
 
   void OpenProfileChooserView(Browser* browser){
     BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
-    NewAvatarButton* button = browser_view->frame()->GetNewAvatarMenuButton();
+    views::View* button = browser_view->frame()->GetNewAvatarMenuButton();
     if (!button)
       NOTREACHED() << "NewAvatarButton not found.";
     if (browser_view->frame()->GetAvatarMenuButton())
@@ -127,8 +126,8 @@ class ProfileChooserViewExtensionsTest : public ExtensionBrowserTest {
     ProfileChooserView::close_on_deactivate_for_testing_ = false;
 
     ui::MouseEvent e(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(),
-                     ui::EventTimeForNow(), 0, 0);
-    button->NotifyClick(e);
+                     ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0);
+    button->OnMouseReleased(e);
     base::MessageLoop::current()->RunUntilIdle();
     EXPECT_TRUE(ProfileChooserView::IsShowing());