Change default code flag to NewAvatarMenu.

chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm
index 90160c16f5ebb65a72dbc774ae73b6f724ca801f..2a82c2f543fcbd8a741c91d2913b53f38a0ae8da 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm
@@ -14,6 +14,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
+#include "components/signin/core/common/profile_management_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ -21,6 +22,8 @@ namespace {
 class BookmarkSyncPromoControllerTest : public BrowserWithTestWindowTest {
  public:
   void SetUp() override {
+    switches::DisableNewAvatarMenuForTesting(
+        base::CommandLine::ForCurrentProcess());

[noms (inactive), 2015/03/09 19:26:17]

But don't we get this bubble with or without the flag? Why do we need to disable
it here?

[Mike Lerman, 2015/03/10 15:58:58]

The SyncPromo calls chrome::ShowBrowserSignin, which shows either a bubble or a
tab based on IsNewAvatarMenu(), and we can't really detect if the
ProfileChooserController's showing like we can in Views, so we just test the old
flow here.

     BrowserWithTestWindowTest::SetUp();
     ASSERT_TRUE(profile());
     // Adds TestExtensionSystem, since signin uses the gaia auth extension.