Alternate NTP: Show detached bookmark bar

chrome/browser/ui/bookmarks/bookmark_browsertest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #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"
 #include "content/public/test/browser_test_utils.h"
 
 namespace {
 const char kPersistBookmarkURL[] = "http://www.cnn.com/";
 const char kPersistBookmarkTitle[] = "CNN";
 }
 
 class BookmarkBrowsertest : public InProcessBrowserTest {
  public:
-  BookmarkBrowsertest() {}
-
   bool IsVisible() {
     return browser()->bookmark_bar_state() == BookmarkBar::SHOW;
   }
 
   static void CheckAnimation(Browser* browser, const base::Closure& quit_task) {
     if (!browser->window()->IsBookmarkBarAnimating())
       quit_task.Run();
   }
 
   base::TimeDelta WaitForBookmarkBarAnimationToFinish() {
@@ skipping 11 matching lines @@
   }
 
   BookmarkModel* WaitForBookmarkModel(Profile* profile) {
     BookmarkModel* bookmark_model =
         BookmarkModelFactory::GetForProfile(profile);
     ui_test_utils::WaitForBookmarkModelToLoad(bookmark_model);
     return bookmark_model;
   }
 };
 
+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());
   chrome::ExecuteCommand(browser(), IDC_SHOW_BOOKMARK_BAR);
   base::TimeDelta delay = WaitForBookmarkBarAnimationToFinish();
   LOG(INFO) << "Took " << delay.InMilliseconds() << " ms to show bookmark bar";
   ASSERT_TRUE(IsVisible());
   chrome::ExecuteCommand(browser(), IDC_SHOW_BOOKMARK_BAR);
   delay = WaitForBookmarkBarAnimationToFinish();
   LOG(INFO) << "Took " << delay.InMilliseconds() << " ms to hide bookmark bar";
@@ skipping 41 matching lines @@
       bookmark_model1, GURL(kPersistBookmarkURL),
       ASCIIToUTF16(kPersistBookmarkTitle));
   std::vector<BookmarkService::URLAndTitle> urls1, urls2;
   bookmark_model1->GetBookmarks(&urls1);
   bookmark_model2->GetBookmarks(&urls2);
   ASSERT_EQ(1u, urls1.size());
   ASSERT_TRUE(urls2.empty());
 }
 
 #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());
+}