Reland of: Change default code flag to NewAvatarMenu.

chrome/browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc

Index: chrome/browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc
diff --git a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc
similarity index 75%
rename from chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc
rename to chrome/browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc
index 536c1eafb699cfc3328e1b5d552f8087ae1f84b1..82e3dd9806eeb4c888c29ef81ab9d87d826381a4 100644
--- a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
@@ -23,6 +24,12 @@
 #include "ui/events/event_constants.h"
 #include "ui/gfx/range/range.h"
 
+#if defined(OS_CHROMEOS)
+const bool kHasProfileChooser = false;
+#else
+const bool kHasProfileChooser = true;
+#endif
+
 class BookmarkBubbleSignInDelegateTest : public InProcessBrowserTest {
  public:
   BookmarkBubbleSignInDelegateTest() {}
@@ -55,8 +62,12 @@ IN_PROC_BROWSER_TEST_F(BookmarkBubbleSignInDelegateTest, OnSignInLinkClicked) {
 
   delegate->OnSignInLinkClicked();
 
-  // A new tab should have been opened and the browser should be visible.
-  EXPECT_EQ(starting_tab_count + 1, browser()->tab_strip_model()->count());
+  if (kHasProfileChooser) {
+    EXPECT_TRUE(ProfileChooserView::IsShowing());
+    EXPECT_EQ(starting_tab_count, browser()->tab_strip_model()->count());
+  } else {
+    EXPECT_EQ(starting_tab_count + 1, browser()->tab_strip_model()->count());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(BookmarkBubbleSignInDelegateTest,
@@ -68,8 +79,12 @@ IN_PROC_BROWSER_TEST_F(BookmarkBubbleSignInDelegateTest,
 
   delegate->OnSignInLinkClicked();
 
-  // A new tab should have been opened and the browser should be visible.
-  EXPECT_EQ(starting_tab_count, browser()->tab_strip_model()->count());
+  if (kHasProfileChooser) {
+    EXPECT_TRUE(ProfileChooserView::IsShowing());
+    EXPECT_EQ(starting_tab_count, browser()->tab_strip_model()->count());
+  } else {
+    EXPECT_EQ(starting_tab_count, browser()->tab_strip_model()->count());
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(BookmarkBubbleSignInDelegateTest,
@@ -86,11 +101,15 @@ IN_PROC_BROWSER_TEST_F(BookmarkBubbleSignInDelegateTest,
 
   delegate->OnSignInLinkClicked();
 
-  // A new tab should have been opened in the normal browser, which should be
-  // visible.
-  int tab_count_normal = browser()->tab_strip_model()->count();
-  EXPECT_EQ(starting_tab_count_normal + 1, tab_count_normal);
-
+  if (kHasProfileChooser) {
+    // ProfileChooser doesn't show in an incognito window.
+    EXPECT_FALSE(ProfileChooserView::IsShowing());
+  } else {
+    // A new tab should have been opened in the normal browser, which should be
+    // visible.
+    int tab_count_normal = browser()->tab_strip_model()->count();
+    EXPECT_EQ(starting_tab_count_normal + 1, tab_count_normal);
+  }
   // No effect is expected on the incognito browser.
   int tab_count_incognito = incognito_browser->tab_strip_model()->count();
   EXPECT_EQ(starting_tab_count_incognito, tab_count_incognito);
@@ -117,8 +136,12 @@ IN_PROC_BROWSER_TEST_F(BookmarkBubbleSignInDelegateTest, BrowserRemoved) {
 
   delegate->OnSignInLinkClicked();
 
-  // A new tab should have been opened in the extra browser, which should be
-  // visible.
-  int tab_count = extra_browser->tab_strip_model()->count();
-  EXPECT_EQ(starting_tab_count + 1, tab_count);
+  if (kHasProfileChooser) {
+    EXPECT_TRUE(ProfileChooserView::IsShowing());
+  } else {
+    // A new tab should have been opened in the extra browser, which should be
+    // visible.
+    int tab_count = extra_browser->tab_strip_model()->count();
+    EXPECT_EQ(starting_tab_count + 1, tab_count);
+  }
 }