Index: chrome/browser/ui/toolbar/toolbar_model_unittest.cc |
diff --git a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc |
index a9ec9cb7e7a8472595e4db3cf324dbcdf720845c..c3b6882de05a0cd44b7b69453084027c401e26ed 100644 |
--- a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc |
+++ b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc |
@@ -8,35 +8,59 @@ |
#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" |
typedef BrowserWithTestWindowTest ToolbarModelTest; |
+// Test that URLs are correctly shown or hidden both during navigation and |
+// after commit. |
TEST_F(ToolbarModelTest, ShouldDisplayURL) { |
+ AddTab(browser(), GURL("about:blank")); |
Paweł Hajdan Jr.
2011/10/11 22:26:18
nit: Please use a constant for this. There is one
Charlie Reis
2011/10/12 21:55:56
Done.
|
+ 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()); |
+ 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"), |
GURL(), CURRENT_TAB, PageTransition::TYPED); |
EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL()); |
EXPECT_EQ(ASCIIToUTF16("about:blank"), |
browser()->toolbar_model()->GetText()); |
+ CommitPendingLoad(&contents->controller()); |
+ EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL()); |
+ EXPECT_EQ(ASCIIToUTF16("about:blank"), |
Paweł Hajdan Jr.
2011/10/11 22:26:18
nit: This too.
Charlie Reis
2011/10/12 21:55:56
Done.
|
+ browser()->toolbar_model()->GetText()); |
} |