InstantExtended: update tests for Instant Extended (part 4).

These tests will break when InstantExtended is turned on by default because of
the apps shortcut. There is already tests that cover cases when the apps
shortcut is shown, so just disable the shortcut for the broken tests.

(Note that this is split off from http://crrev.com/24733003 so we don't have a
single mega change that turns on Instant Extended.)

BUG=297915
R=asvitkine@chromium.org

Review URL: https://codereview.chromium.org/64533005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234930 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 0 deletions

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index 892e5cc..5f0abf5 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -1522,6 +1522,11 @@ TEST_F(BookmarkBarControllerTest, ShrinkOrHideView) {
 }
 
 TEST_F(BookmarkBarControllerTest, LastBookmarkResizeBehavior) {
+  // Hide the apps shortcut.
+  profile()->GetPrefs()->SetBoolean(prefs::kShowAppsShortcutInBookmarkBar,
+                                    false);
+  ASSERT_TRUE([bar_ appsPageShortcutButtonIsHidden]);
+
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* root = model->bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");
@@ -1979,6 +1984,11 @@ TEST_F(BookmarkBarControllerDragDropTest, DropPositionIndicator) {
   const std::string model_string("1b 2f:[ 2f1b 2f2b 2f3b ] 3b 4b ");
   test::AddNodesFromModelString(model, root, model_string);
 
+  // Hide the apps shortcut.
+  profile()->GetPrefs()->SetBoolean(prefs::kShowAppsShortcutInBookmarkBar,
+                                    false);
+  ASSERT_TRUE([bar_ appsPageShortcutButtonIsHidden]);
+
   // Validate initial model.
   std::string actualModel = test::ModelStringFromNode(root);
   EXPECT_EQ(model_string, actualModel);