Chromium Code Reviews| Index: chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm |
| diff --git a/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm |
| index e2acb1c9f4577f381cb22885cc19b0b5649256d0..aadbee92e963a63a2f6ff6480d47567e84993f4d 100644 |
| --- a/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm |
| +++ b/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm |
| @@ -4,6 +4,7 @@ |
| #import "chrome/browser/ui/cocoa/profiles/profile_menu_controller.h" |
| +#include "base/command_line.h" |
| #include "base/mac/scoped_nsobject.h" |
| #include "base/strings/utf_string_conversions.h" |
| #include "base/threading/thread_restrictions.h" |
| @@ -17,6 +18,7 @@ |
| #include "chrome/grit/generated_resources.h" |
| #include "chrome/test/base/test_browser_window.h" |
| #include "chrome/test/base/testing_profile.h" |
| +#include "components/signin/core/common/profile_management_switches.h" |
| #include "testing/gtest_mac.h" |
| #include "ui/base/l10n/l10n_util_mac.h" |
| @@ -31,6 +33,8 @@ class ProfileMenuControllerTest : public CocoaProfileTest { |
| } |
| void SetUp() override { |
| + switches::DisableNewAvatarMenuForTesting( |
|
noms (inactive)
2015/03/09 19:26:17
Why are we disabling the flag? This is the os menu
Mike Lerman
2015/03/10 15:58:58
Is it? Oh. Trying to count the numbers of items in
noms (inactive)
2015/03/17 14:26:30
At the moment for one profile, it's showing up in
Mike Lerman
2015/03/18 19:29:48
Okay, good. I'll leave it Enabled then.
|
| + base::CommandLine::ForCurrentProcess()); |
| CocoaProfileTest::SetUp(); |
| ASSERT_TRUE(profile()); |