diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 04:37:24 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 04:37:24 +0000 |
| commit | 64fbfe318caa5ed948b4fc76d20faab443510761 (patch) | |
| tree | e3ef9c520f12f777b227ed4debee8f62144b96a6 /content/browser/tab_contents/navigation_controller_unittest.cc | |
| parent | 0d6e9bd0a2788f03f07f4b90a222fe06270b79b5 (diff) | |
| download | chromium_src-64fbfe318caa5ed948b4fc76d20faab443510761.zip chromium_src-64fbfe318caa5ed948b4fc76d20faab443510761.tar.gz chromium_src-64fbfe318caa5ed948b4fc76d20faab443510761.tar.bz2 | |
Move navigation_types.h from content/common to content/public/browser, and put it in the content namespace. There was no reason for it to be in common since it's only used by browser. I also updated the enum names to match the rest of the enums in the Content API.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/8339006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106029 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/tab_contents/navigation_controller_unittest.cc')
| -rw-r--r-- | content/browser/tab_contents/navigation_controller_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/tab_contents/navigation_controller_unittest.cc b/content/browser/tab_contents/navigation_controller_unittest.cc index d897748..3ef5f39 100644 --- a/content/browser/tab_contents/navigation_controller_unittest.cc +++ b/content/browser/tab_contents/navigation_controller_unittest.cc @@ -889,7 +889,7 @@ TEST_F(NavigationControllerTest, Redirect) { EXPECT_TRUE(notifications.Check1AndReset( content::NOTIFICATION_NAV_ENTRY_COMMITTED)); - EXPECT_TRUE(details.type == NavigationType::SAME_PAGE); + EXPECT_TRUE(details.type == content::NAVIGATION_TYPE_SAME_PAGE); EXPECT_EQ(controller().entry_count(), 1); EXPECT_EQ(controller().last_committed_entry_index(), 0); EXPECT_TRUE(controller().GetLastCommittedEntry()); @@ -947,7 +947,7 @@ TEST_F(NavigationControllerTest, PostThenRedirect) { EXPECT_TRUE(notifications.Check1AndReset( content::NOTIFICATION_NAV_ENTRY_COMMITTED)); - EXPECT_TRUE(details.type == NavigationType::SAME_PAGE); + EXPECT_TRUE(details.type == content::NAVIGATION_TYPE_SAME_PAGE); EXPECT_EQ(controller().entry_count(), 1); EXPECT_EQ(controller().last_committed_entry_index(), 0); EXPECT_TRUE(controller().GetLastCommittedEntry()); @@ -994,7 +994,7 @@ TEST_F(NavigationControllerTest, ImmediateRedirect) { EXPECT_TRUE(notifications.Check1AndReset( content::NOTIFICATION_NAV_ENTRY_COMMITTED)); - EXPECT_TRUE(details.type == NavigationType::NEW_PAGE); + EXPECT_TRUE(details.type == content::NAVIGATION_TYPE_NEW_PAGE); EXPECT_EQ(controller().entry_count(), 1); EXPECT_EQ(controller().last_committed_entry_index(), 0); EXPECT_TRUE(controller().GetLastCommittedEntry()); |