summaryrefslogtreecommitdiffstats
path: root/chrome/browser/web_contents_unittest.cc
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-27 18:09:07 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-27 18:09:07 +0000
commit1e5645ff803bf73889ced446dab5b5f81e6023c0 (patch)
tree560899029aee3d7b933ae5baf1e17f89d90696a1 /chrome/browser/web_contents_unittest.cc
parent473343c408b846fda90eba9bd7cf96a342f6f286 (diff)
downloadchromium_src-1e5645ff803bf73889ced446dab5b5f81e6023c0.zip
chromium_src-1e5645ff803bf73889ced446dab5b5f81e6023c0.tar.gz
chromium_src-1e5645ff803bf73889ced446dab5b5f81e6023c0.tar.bz2
Cleanup navigation_entry.h. I made the accessors consistent and in Google style, and organized and commented all the entries. Hopefully it will be much easier to find things and deal with this class.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_contents_unittest.cc')
-rw-r--r--chrome/browser/web_contents_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/web_contents_unittest.cc b/chrome/browser/web_contents_unittest.cc
index 032e8eb..26024da 100644
--- a/chrome/browser/web_contents_unittest.cc
+++ b/chrome/browser/web_contents_unittest.cc
@@ -1152,26 +1152,26 @@ TEST_F(WebContentsTest, NavigationEntryContentState) {
InitNavigateParams(&params1, 1, url);
contents->TestDidNavigate(orig_rvh, params1);
entry = contents->controller()->GetLastCommittedEntry();
- EXPECT_FALSE(entry->GetContentState().empty());
+ EXPECT_FALSE(entry->content_state().empty());
// Navigate to same site.
const GURL url2("http://images.google.com");
contents->controller()->LoadURL(url2, PageTransition::TYPED);
entry = contents->controller()->GetLastCommittedEntry();
- EXPECT_FALSE(entry->GetContentState().empty());
+ EXPECT_FALSE(entry->content_state().empty());
// Committed entry should have content state after DidNavigate.
ViewHostMsg_FrameNavigate_Params params2;
InitNavigateParams(&params2, 2, url2);
contents->TestDidNavigate(orig_rvh, params2);
entry = contents->controller()->GetLastCommittedEntry();
- EXPECT_FALSE(entry->GetContentState().empty());
+ EXPECT_FALSE(entry->content_state().empty());
// Now go back. Committed entry should still have content state.
contents->controller()->GoBack();
contents->TestDidNavigate(orig_rvh, params1);
entry = contents->controller()->GetLastCommittedEntry();
- EXPECT_FALSE(entry->GetContentState().empty());
+ EXPECT_FALSE(entry->content_state().empty());
}
// Test that NavigationEntries have the correct content state after opening
@@ -1189,7 +1189,7 @@ TEST_F(WebContentsTest, NavigationEntryContentStateNewWindow) {
// Should have a content state here.
NavigationEntry* entry = contents->controller()->GetLastCommittedEntry();
- EXPECT_FALSE(entry->GetContentState().empty());
+ EXPECT_FALSE(entry->content_state().empty());
}
// Tests that IsInPageNavigation returns appropriate results. Prevents