diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 23:16:54 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 23:16:54 +0000 |
| commit | ebe89e0676c12a6ebccb35fef1611323d1b35afb (patch) | |
| tree | ec1d1715d14c3fb182f0d39fc9178b40c4951897 /chrome/browser/tab_contents/navigation_entry_unittest.cc | |
| parent | 5e344a39782b73070a679f0d12a996a012c7e3de (diff) | |
| download | chromium_src-ebe89e0676c12a6ebccb35fef1611323d1b35afb.zip chromium_src-ebe89e0676c12a6ebccb35fef1611323d1b35afb.tar.gz chromium_src-ebe89e0676c12a6ebccb35fef1611323d1b35afb.tar.bz2 | |
Reland r23357 since it doesn't seem to be the cause of unit test
failure:
Renames the NavigationEntry::display_url() to virtual_url().
BUG=6970 (http://crbug.com/6970)
TEST=None
Patch by Thiago Farina <thiago.farina@gmail.com> at
http://codereview.chromium.org/164383
Review URL: http://codereview.chromium.org/165501
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23374 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/navigation_entry_unittest.cc')
| -rw-r--r-- | chrome/browser/tab_contents/navigation_entry_unittest.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/tab_contents/navigation_entry_unittest.cc b/chrome/browser/tab_contents/navigation_entry_unittest.cc index 0a9f814..6f8957d 100644 --- a/chrome/browser/tab_contents/navigation_entry_unittest.cc +++ b/chrome/browser/tab_contents/navigation_entry_unittest.cc @@ -44,18 +44,18 @@ TEST_F(NavigationEntryTest, NavigationEntryUniqueIDs) { // Test URL accessors TEST_F(NavigationEntryTest, NavigationEntryURLs) { - // Start with no display_url (even if a url is set) - EXPECT_FALSE(entry1_.get()->has_display_url()); - EXPECT_FALSE(entry2_.get()->has_display_url()); + // Start with no virtual_url (even if a url is set) + EXPECT_FALSE(entry1_.get()->has_virtual_url()); + EXPECT_FALSE(entry2_.get()->has_virtual_url()); EXPECT_EQ(GURL(), entry1_.get()->url()); - EXPECT_EQ(GURL(), entry1_.get()->display_url()); + EXPECT_EQ(GURL(), entry1_.get()->virtual_url()); EXPECT_TRUE(entry1_.get()->GetTitleForDisplay(NULL).empty()); - // Setting URL affects display_url and GetTitleForDisplay + // Setting URL affects virtual_url and GetTitleForDisplay entry1_.get()->set_url(GURL("http://www.google.com")); EXPECT_EQ(GURL("http://www.google.com"), entry1_.get()->url()); - EXPECT_EQ(GURL("http://www.google.com/"), entry1_.get()->display_url()); + EXPECT_EQ(GURL("http://www.google.com/"), entry1_.get()->virtual_url()); EXPECT_EQ(ASCIIToUTF16("http://www.google.com/"), entry1_.get()->GetTitleForDisplay(NULL)); @@ -63,13 +63,13 @@ TEST_F(NavigationEntryTest, NavigationEntryURLs) { entry1_.get()->set_title(ASCIIToUTF16("Google")); EXPECT_EQ(ASCIIToUTF16("Google"), entry1_.get()->GetTitleForDisplay(NULL)); - // Setting display_url doesn't affect URL - entry2_.get()->set_display_url(GURL("display:url")); - EXPECT_TRUE(entry2_.get()->has_display_url()); + // Setting virtual_url doesn't affect URL + entry2_.get()->set_virtual_url(GURL("display:url")); + EXPECT_TRUE(entry2_.get()->has_virtual_url()); EXPECT_EQ(GURL("test:url"), entry2_.get()->url()); - EXPECT_EQ(GURL("display:url"), entry2_.get()->display_url()); + EXPECT_EQ(GURL("display:url"), entry2_.get()->virtual_url()); - // Having a title set in constructor overrides display URL + // Having a title set in constructor overrides virtual URL EXPECT_EQ(ASCIIToUTF16("title"), entry2_.get()->GetTitleForDisplay(NULL)); // User typed URL is independent of the others |