Change default code flag to NewAvatarMenu.

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/test_extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bubble_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #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"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/range/range.h"
 
+

[sky, 2015/03/09 15:54:20]

nit: remove this newline.

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

Done.

 class BookmarkBubbleSignInDelegateTest : public InProcessBrowserTest {
  public:
   BookmarkBubbleSignInDelegateTest() {}
 
   Profile* profile() { return browser()->profile(); }
 
   void ReplaceBlank(Browser* browser);
 
+  void ExpectProfileChooserShows(bool shows);
+
  private:
   DISALLOW_COPY_AND_ASSIGN(BookmarkBubbleSignInDelegateTest);
 };
 
 // The default browser created for tests start with one tab open on
 // about:blank.  The sign-in page is a singleton that will
 // replace this tab.  This function replaces about:blank with another URL
 // so that the sign in page goes into a new tab.
 void BookmarkBubbleSignInDelegateTest::ReplaceBlank(Browser* browser) {
   chrome::NavigateParams params(
       chrome::GetSingletonTabNavigateParams(browser, GURL("chrome:version")));
   params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
   chrome::ShowSingletonTabOverwritingNTP(browser, params);
 }
 
+void BookmarkBubbleSignInDelegateTest::ExpectProfileChooserShows(bool shows) {
+  base::MessageLoop::current()->RunUntilIdle();

[sky, 2015/03/09 15:54:20]

We do you need the RunUntilIdle?

The pattern you have here is rather confusing. I think it'll be easier to read
if you change this to something like IsProfilerChooserShowing() (no args), and
move the assertion to the call site, eg instead of:

  ExpectProfileChooserShows(true);

you have:

  EXPECT_TRUE(IsProfileChooserShowing());

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

We don't need the Runloop();. I thought we didn't, but hadn't tested that.

Ok - pattern changed. I had that from before I had changed certain things about
this test.

+  // There's no good way, across platforms, to determine if the User Menu shows.
+  // Verify for Views, and otherwise we just check nothing crashed.
+#if defined(TOOLKIT_VIEWS)
+  EXPECT_EQ(shows, ProfileChooserView::IsShowing());
+#endif
+}
+
 IN_PROC_BROWSER_TEST_F(BookmarkBubbleSignInDelegateTest, OnSignInLinkClicked) {
   ReplaceBlank(browser());
   int starting_tab_count = browser()->tab_strip_model()->count();
 
   scoped_ptr<BookmarkBubbleDelegate> delegate;
   delegate.reset(new BookmarkBubbleSignInDelegate(browser()));
 
   delegate->OnSignInLinkClicked();
 
-  // A new tab should have been opened and the browser should be visible.
+#if defined(OS_CHROMEOS)

[sky, 2015/03/09 15:54:20]

All these ifdefs make it hard to follow. I think it would be easier if the
condition was around a constant, eg:

if (kHasProfileChooser) {
  ...
}

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

Done.

+  // ChromeOS has no Profile Chooser; signin happens in a full tab.
   EXPECT_EQ(starting_tab_count + 1, browser()->tab_strip_model()->count());
+#else
+  // The browser remains visible and the Profile Chooser shows.
+  ExpectProfileChooserShows(true);
+  EXPECT_EQ(starting_tab_count, browser()->tab_strip_model()->count());
+#endif
 }
 
 IN_PROC_BROWSER_TEST_F(BookmarkBubbleSignInDelegateTest,
                        OnSignInLinkClickedReusesBlank) {
   int starting_tab_count = browser()->tab_strip_model()->count();
 
   scoped_ptr<BookmarkBubbleDelegate> delegate;
   delegate.reset(new BookmarkBubbleSignInDelegate(browser()));
 
   delegate->OnSignInLinkClicked();
 
-  // A new tab should have been opened and the browser should be visible.
+#if defined(OS_CHROMEOS)
+  // ChromeOS has no Profile Chooser; signin happens in a full tab.
   EXPECT_EQ(starting_tab_count, browser()->tab_strip_model()->count());
+#else
+  // The browser remains visible and the Profile Chooser shows.
+  ExpectProfileChooserShows(true);
+  EXPECT_EQ(starting_tab_count, browser()->tab_strip_model()->count());
+#endif
 }
 
 IN_PROC_BROWSER_TEST_F(BookmarkBubbleSignInDelegateTest,
                        OnSignInLinkClickedIncognito) {
   ReplaceBlank(browser());
   Browser* incognito_browser = CreateIncognitoBrowser();
 
+#if defined(OS_CHROMEOS)
   int starting_tab_count_normal = browser()->tab_strip_model()->count();
+#endif
   int starting_tab_count_incognito =
       incognito_browser->tab_strip_model()->count();
 
   scoped_ptr<BookmarkBubbleDelegate> delegate;
   delegate.reset(new BookmarkBubbleSignInDelegate(incognito_browser));
 
   delegate->OnSignInLinkClicked();
 
+
+#if defined(OS_CHROMEOS)
+  // ChromeOS has no Profile Chooser; signin happens in a full tab.
   // 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);
+#else
+  // ProfileChooser doesn't show in an incognito window.
+  ExpectProfileChooserShows(false);
+
+  // 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);
+#endif
 }
-
 // Verifies that the sign in page can be loaded in a different browser
 // if the provided browser is invalidated.
 IN_PROC_BROWSER_TEST_F(BookmarkBubbleSignInDelegateTest, BrowserRemoved) {
   // Create an extra browser.
   Browser* extra_browser = CreateBrowser(profile());
   ReplaceBlank(extra_browser);
 
+#if defined(OS_CHROMEOS)
   int starting_tab_count = extra_browser->tab_strip_model()->count();
+#endif
 
   scoped_ptr<BookmarkBubbleDelegate> delegate;
   delegate.reset(new BookmarkBubbleSignInDelegate(browser()));
 
   BrowserList::SetLastActive(extra_browser);
 
   // Close all tabs in the original browser.  Run all pending messages
   // to make sure the browser window closes before continuing.
   browser()->tab_strip_model()->CloseAllTabs();
   content::RunAllPendingInMessageLoop();
 
   delegate->OnSignInLinkClicked();
 
+#if defined(OS_CHROMEOS)
+  // ChromeOS has no Profile Chooser; signin happens in a full tab.
   // 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);
+#else
+  // The Profile Chooser shows in a browser.
+  ExpectProfileChooserShows(true);
+#endif
 }