Alternate NTP: Show detached bookmark bar

chrome/browser/ui/bookmarks/bookmark_browsertest.cc

Index: chrome/browser/ui/bookmarks/bookmark_browsertest.cc
diff --git a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc
index 5e8a7b29da7936de3268c3638fc039c6941df61c..c3ca7a2afcf05cd175389bae51909a3634d2864a 100644
--- a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc
@@ -16,7 +16,9 @@
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
+#include "chrome/browser/ui/search/search.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
@@ -29,8 +31,6 @@ const char kPersistBookmarkTitle[] = "CNN";
 
 class BookmarkBrowsertest : public InProcessBrowserTest {
  public:
-  BookmarkBrowsertest() {}
-
   bool IsVisible() {
     return browser()->bookmark_bar_state() == BookmarkBar::SHOW;
   }
@@ -62,6 +62,13 @@ class BookmarkBrowsertest : public InProcessBrowserTest {
   }
 };
 
+class BookmarkInstantExtendedBrowsertest : public InProcessBrowserTest {
+ public:
+  BookmarkInstantExtendedBrowsertest() {
+    chrome::search::EnableInstantExtendedAPIForTesting();
+  }
+};

[sky, 2013/02/12 03:27:49]

private:DISALLOW... and move this above tests that subclass it. I also encourage
to investigate making this a unit test.

[sail, 2013/02/12 03:34:04]

Done.

One advantage of making this a browser test is that it properly tests the
behavior of Browser::UpdateBookmarkBarState().

+
 // Test of bookmark bar toggling, visibility, and animation.
 IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, BookmarkBarVisibleWait) {
   ASSERT_FALSE(IsVisible());
@@ -123,3 +130,22 @@ IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, DISABLED_MultiProfile) {
 }
 
 #endif
+
+// Verify that the detached bookmark bar is visible on the new tab page.
+IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, DetachedBookmarkBar) {
+  AddTabAtIndex(1,
+                GURL(chrome::kChromeUINewTabURL),
+                content::PAGE_TRANSITION_LINK);
+  EXPECT_EQ(BookmarkBar::DETACHED, browser()->bookmark_bar_state());
+}
+
+// Verify that in instant extended mode the detached bookmark bar is visible on
+// the new tab page.
+IN_PROC_BROWSER_TEST_F(BookmarkInstantExtendedBrowsertest,
+                       DetachedBookmarkBar) {
+  chrome::search::EnableInstantExtendedAPIForTesting();
+  AddTabAtIndex(1,
+                GURL(chrome::kChromeUINewTabURL),
+                content::PAGE_TRANSITION_LINK);
+  EXPECT_EQ(BookmarkBar::DETACHED, browser()->bookmark_bar_state());
+}