diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 22:45:34 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 22:45:34 +0000 |
| commit | b689fce776a394377fed51ae063942509a2988a1 (patch) | |
| tree | eb52e9944db424e9e1b80bcefe9b9b96b1c27b50 /chrome/browser/navigation_entry_unittest.cc | |
| parent | 84ae20cba3059760948ca5d1f313dc25c74b26d6 (diff) | |
| download | chromium_src-b689fce776a394377fed51ae063942509a2988a1.zip chromium_src-b689fce776a394377fed51ae063942509a2988a1.tar.gz chromium_src-b689fce776a394377fed51ae063942509a2988a1.tar.bz2 | |
Merge DOMUIContents into WebContents.
I did a lot of cleanup of the DOM UI system as part of this.
Review URL: http://codereview.chromium.org/42227
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/navigation_entry_unittest.cc')
| -rw-r--r-- | chrome/browser/navigation_entry_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/navigation_entry_unittest.cc b/chrome/browser/navigation_entry_unittest.cc index 7d4f77a..2e36144 100644 --- a/chrome/browser/navigation_entry_unittest.cc +++ b/chrome/browser/navigation_entry_unittest.cc @@ -15,7 +15,7 @@ class NavigationEntryTest : public testing::Test { entry1_.reset(new NavigationEntry(TAB_CONTENTS_WEB)); instance_ = SiteInstance::CreateSiteInstance(NULL); - entry2_.reset(new NavigationEntry(TAB_CONTENTS_DOM_UI, instance_, 3, + entry2_.reset(new NavigationEntry(TAB_CONTENTS_WEB, instance_, 3, GURL("test:url"), GURL("from"), ASCIIToUTF16("title"), @@ -125,7 +125,7 @@ TEST_F(NavigationEntryTest, NavigationEntrySSLStatus) { TEST_F(NavigationEntryTest, NavigationEntryAccessors) { // Type EXPECT_EQ(TAB_CONTENTS_WEB, entry1_.get()->tab_type()); - EXPECT_EQ(TAB_CONTENTS_DOM_UI, entry2_.get()->tab_type()); + EXPECT_EQ(TAB_CONTENTS_WEB, entry2_.get()->tab_type()); // SiteInstance EXPECT_TRUE(entry1_.get()->site_instance() == NULL); |