ntp4: fix tests due to new default ntp

chrome/browser/ui/webui/web_ui_unittest.cc

Index: chrome/browser/ui/webui/web_ui_unittest.cc
diff --git a/chrome/browser/ui/webui/web_ui_unittest.cc b/chrome/browser/ui/webui/web_ui_unittest.cc
index 2db0ec8ec2eb828295ee9ba03dee3a527c44fdd8..e75ca8756799941b46353d810e5529b2b7632359 100644
--- a/chrome/browser/ui/webui/web_ui_unittest.cc
+++ b/chrome/browser/ui/webui/web_ui_unittest.cc
@@ -37,7 +37,6 @@ class WebUITest : public TabContentsWrapperTestHarness {
     // Check the things the pending Web UI should have set.
     EXPECT_FALSE(contents->ShouldDisplayURL());
     EXPECT_FALSE(wrapper->favicon_tab_helper()->ShouldDisplayFavicon());
-    EXPECT_TRUE(wrapper->bookmark_tab_helper()->ShouldShowBookmarkBar());
     EXPECT_TRUE(contents->FocusLocationBarByDefault());
 
     // Now commit the load.
@@ -47,7 +46,6 @@ class WebUITest : public TabContentsWrapperTestHarness {
     // The same flags should be set as before now that the load has committed.
     EXPECT_FALSE(contents->ShouldDisplayURL());
     EXPECT_FALSE(wrapper->favicon_tab_helper()->ShouldDisplayFavicon());
-    EXPECT_TRUE(wrapper->bookmark_tab_helper()->ShouldShowBookmarkBar());
     EXPECT_TRUE(contents->FocusLocationBarByDefault());
 
     // Start a pending navigation to a regular page.
@@ -58,7 +56,6 @@ class WebUITest : public TabContentsWrapperTestHarness {
     // should reflect the old one (bookmark bar) until it has committed.
     EXPECT_TRUE(contents->ShouldDisplayURL());
     EXPECT_TRUE(wrapper->favicon_tab_helper()->ShouldDisplayFavicon());
-    EXPECT_TRUE(wrapper->bookmark_tab_helper()->ShouldShowBookmarkBar());
     EXPECT_FALSE(contents->FocusLocationBarByDefault());
 
     // Commit the regular page load. Note that we must send it to the "pending"
@@ -78,7 +75,6 @@ class WebUITest : public TabContentsWrapperTestHarness {
     // The state should now reflect a regular page.
     EXPECT_TRUE(contents->ShouldDisplayURL());
     EXPECT_TRUE(wrapper->favicon_tab_helper()->ShouldDisplayFavicon());
-    EXPECT_FALSE(wrapper->bookmark_tab_helper()->ShouldShowBookmarkBar());
     EXPECT_FALSE(contents->FocusLocationBarByDefault());
   }
 
@@ -118,8 +114,6 @@ TEST_F(WebUITest, WebUIToWebUI) {
   EXPECT_FALSE(contents()->ShouldDisplayURL());
   EXPECT_FALSE(
       contents_wrapper()->favicon_tab_helper()->ShouldDisplayFavicon());
-  EXPECT_TRUE(
-      contents_wrapper()->bookmark_tab_helper()->ShouldShowBookmarkBar());
   EXPECT_TRUE(contents()->FocusLocationBarByDefault());
 }
 
@@ -132,16 +126,12 @@ TEST_F(WebUITest, StandardToWebUI) {
   // The state should now reflect the default.
   EXPECT_TRUE(contents()->ShouldDisplayURL());
   EXPECT_TRUE(contents_wrapper()->favicon_tab_helper()->ShouldDisplayFavicon());
-  EXPECT_FALSE(
-      contents_wrapper()->bookmark_tab_helper()->ShouldShowBookmarkBar());
   EXPECT_FALSE(contents()->FocusLocationBarByDefault());
 
   // Commit the load, the state should be the same.
   rvh()->SendNavigate(1, std_url);
   EXPECT_TRUE(contents()->ShouldDisplayURL());
   EXPECT_TRUE(contents_wrapper()->favicon_tab_helper()->ShouldDisplayFavicon());
-  EXPECT_FALSE(
-      contents_wrapper()->bookmark_tab_helper()->ShouldShowBookmarkBar());
   EXPECT_FALSE(contents()->FocusLocationBarByDefault());
 
   // Start a pending load for a WebUI.
@@ -149,8 +139,6 @@ TEST_F(WebUITest, StandardToWebUI) {
   controller().LoadURL(new_tab_url, GURL(), PageTransition::LINK);
   EXPECT_FALSE(contents()->ShouldDisplayURL());
   EXPECT_TRUE(contents_wrapper()->favicon_tab_helper()->ShouldDisplayFavicon());
-  EXPECT_FALSE(
-      contents_wrapper()->bookmark_tab_helper()->ShouldShowBookmarkBar());
   EXPECT_TRUE(contents()->FocusLocationBarByDefault());
 
   // Committing Web UI is tested above.