summaryrefslogtreecommitdiffstats
path: root/chrome/browser/session_service_test_helper.cc
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-14 15:42:43 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-14 15:42:43 +0000
commite9ba44740c88677d8b566583f7041d1dd33b6a9d (patch)
tree0d85125a089ba6c36136a22651d196a9ba86ec8f /chrome/browser/session_service_test_helper.cc
parentb5ef2ca48635ddf96698a11676a4625aff6ef734 (diff)
downloadchromium_src-e9ba44740c88677d8b566583f7041d1dd33b6a9d.zip
chromium_src-e9ba44740c88677d8b566583f7041d1dd33b6a9d.tar.gz
chromium_src-e9ba44740c88677d8b566583f7041d1dd33b6a9d.tar.bz2
This is almost a complete rewrite of DidNavigate and the associated NavigationController logic. The approach is that the NavigationController should be responsible for the logic and memory management of navigation. Previously, half the logic and memory management lived in WebContents which made it very hard to figure out what was going on.
I split out the various navigation types into separate functions, which then copy and update any existing NavigationEntry as necessary. Previously, WebContents would make a new one which would be manually populated with random fields (I think some were forgotten, too), and then the NavigationController may or may not commit it. Review URL: http://codereview.chromium.org/479 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/session_service_test_helper.cc')
-rw-r--r--chrome/browser/session_service_test_helper.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/session_service_test_helper.cc b/chrome/browser/session_service_test_helper.cc
index a793ed0..49cedd8 100644
--- a/chrome/browser/session_service_test_helper.cc
+++ b/chrome/browser/session_service_test_helper.cc
@@ -68,7 +68,7 @@ void SessionServiceTestHelper::AssertNavigationEquals(
void SessionServiceTestHelper::AssertSingleWindowWithSingleTab(
const std::vector<SessionWindow*>& windows,
int nav_count) {
- EXPECT_EQ(1, windows.size());
+ ASSERT_EQ(1, windows.size());
EXPECT_EQ(1, windows[0]->tabs.size());
EXPECT_EQ(nav_count, windows[0]->tabs[0]->navigations.size());
}