Fix a bug in ShouldDisplayURL.

chrome/browser/ui/toolbar/toolbar_model_unittest.cc

 // Copyright (c) 2011 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/toolbar/toolbar_model.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
+#include "content/browser/tab_contents/tab_contents.h"
+#include "content/common/url_constants.h"
 
 typedef BrowserWithTestWindowTest ToolbarModelTest;
 
+// Test that URLs are correctly shown or hidden both during navigation and
+// after commit.
 TEST_F(ToolbarModelTest, ShouldDisplayURL) {
+  AddTab(browser(), GURL(chrome::kAboutBlankURL));
+  TabContents* contents = browser()->GetTabContentsAt(0);
+
   browser()->OpenURL(GURL("view-source:http://www.google.com"),
                      GURL(), CURRENT_TAB, PageTransition::TYPED);
   EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL());
   EXPECT_EQ(ASCIIToUTF16("view-source:www.google.com"),
             browser()->toolbar_model()->GetText());
+  CommitPendingLoad(&contents->controller());
+  EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL());
+  EXPECT_EQ(ASCIIToUTF16("view-source:www.google.com"),
+            browser()->toolbar_model()->GetText());
 
   browser()->OpenURL(GURL("view-source:chrome://newtab/"),
                      GURL(), CURRENT_TAB, PageTransition::TYPED);
   EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL());
   EXPECT_EQ(ASCIIToUTF16("view-source:chrome://newtab"),
             browser()->toolbar_model()->GetText());
+  CommitPendingLoad(&contents->controller());

[Aaron Boodman, 2011/10/12 07:41:08]

It would be nice to pull this pattern into a helper function so we can just do:

NavigateAndTest("view-source:www.google.com", true);

That would make it easier to read this test.

[Charlie Reis, 2011/10/12 19:02:57]

Done.

[Aaron Boodman, 2011/10/12 20:18:50]

Great, thanks!

+  EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL());
+  EXPECT_EQ(ASCIIToUTF16("view-source:chrome://newtab"),
+            browser()->toolbar_model()->GetText());
 
   browser()->OpenURL(GURL("chrome-extension://monkey/balls.html"),
                      GURL(), CURRENT_TAB, PageTransition::TYPED);
   EXPECT_FALSE(browser()->toolbar_model()->ShouldDisplayURL());
   EXPECT_EQ(ASCIIToUTF16(""), browser()->toolbar_model()->GetText());
+  CommitPendingLoad(&contents->controller());
+  EXPECT_FALSE(browser()->toolbar_model()->ShouldDisplayURL());
+  EXPECT_EQ(ASCIIToUTF16(""), browser()->toolbar_model()->GetText());
 
   browser()->OpenURL(GURL("chrome://newtab/"),
                      GURL(), CURRENT_TAB, PageTransition::TYPED);
   EXPECT_FALSE(browser()->toolbar_model()->ShouldDisplayURL());
   EXPECT_EQ(ASCIIToUTF16(""), browser()->toolbar_model()->GetText());
+  CommitPendingLoad(&contents->controller());
+  EXPECT_FALSE(browser()->toolbar_model()->ShouldDisplayURL());
+  EXPECT_EQ(ASCIIToUTF16(""), browser()->toolbar_model()->GetText());
 
-  browser()->OpenURL(GURL("about:blank"),
+  browser()->OpenURL(GURL(chrome::kAboutBlankURL),
                      GURL(), CURRENT_TAB, PageTransition::TYPED);
   EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL());
-  EXPECT_EQ(ASCIIToUTF16("about:blank"),
+  EXPECT_EQ(ASCIIToUTF16(chrome::kAboutBlankURL),
+            browser()->toolbar_model()->GetText());
+  CommitPendingLoad(&contents->controller());
+  EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL());
+  EXPECT_EQ(ASCIIToUTF16(chrome::kAboutBlankURL),
             browser()->toolbar_model()->GetText());
 }