Reland of: Change default code flag to NewAvatarMenu.

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

Index: chrome/browser/ui/views/profiles/avatar_menu_button_browsertest.cc
diff --git a/chrome/browser/ui/views/profiles/avatar_menu_button_browsertest.cc b/chrome/browser/ui/views/profiles/avatar_menu_button_browsertest.cc
index 7ad8447d0c34cfbc3ccad62907d805b8fd3b414c..cfe903ae7668f88507c147dddfc8f240a2c5cb16 100644
--- a/chrome/browser/ui/views/profiles/avatar_menu_button_browsertest.cc
+++ b/chrome/browser/ui/views/profiles/avatar_menu_button_browsertest.cc
@@ -17,6 +17,7 @@
 #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 "components/signin/core/common/profile_management_switches.h"
 
 class AvatarMenuButtonTest : public InProcessBrowserTest {
  public:
@@ -24,6 +25,7 @@ class AvatarMenuButtonTest : public InProcessBrowserTest {
   ~AvatarMenuButtonTest() override;
 
  protected:
+  void SetUpCommandLine(base::CommandLine* command_line) override;
   void CreateTestingProfile();
   AvatarMenuButton* GetAvatarMenuButton();
   void StartAvatarMenu();
@@ -38,6 +40,10 @@ AvatarMenuButtonTest::AvatarMenuButtonTest() {
 AvatarMenuButtonTest::~AvatarMenuButtonTest() {
 }
 
+void AvatarMenuButtonTest::SetUpCommandLine(base::CommandLine* command_line) {
+  switches::DisableNewAvatarMenuForTesting(command_line);
+}
+
 void AvatarMenuButtonTest::CreateTestingProfile() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   EXPECT_EQ(1u, profile_manager->GetNumberOfProfiles());