Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6663)

Unified Diff: chrome/browser/tab_contents/navigation_controller_unittest.cc

Issue 5610005: Makes instant run before unload listeners. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome
Patch Set: Fix comments and reset session id appropriately Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/tab_contents/navigation_controller.cc ('k') | chrome/browser/tab_contents/tab_contents.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_contents/navigation_controller_unittest.cc
diff --git a/chrome/browser/tab_contents/navigation_controller_unittest.cc b/chrome/browser/tab_contents/navigation_controller_unittest.cc
index 74682a6367b56d83f6bfdd5dd0a3f82a726db753..74dd068c1dd43b01cfcce3538f835e2c79115855 100644
--- a/chrome/browser/tab_contents/navigation_controller_unittest.cc
+++ b/chrome/browser/tab_contents/navigation_controller_unittest.cc
@@ -1740,9 +1740,9 @@ TEST_F(NavigationControllerTest, CopyStateFromAndPrune) {
EXPECT_EQ(url3, other_controller.GetEntryAtIndex(2)->url());
// The session id of the new tab should be that of the old, and the old should
- // be set to 0.
+ // get a new id.
EXPECT_EQ(id.id(), other_controller.session_id().id());
- EXPECT_EQ(0, controller().session_id().id());
+ EXPECT_NE(id.id(), controller().session_id().id());
}
// Test CopyStateFromAndPrune with 2 urls, the first selected and nothing in
@@ -1770,9 +1770,9 @@ TEST_F(NavigationControllerTest, CopyStateFromAndPrune2) {
EXPECT_EQ(url1, other_controller.GetEntryAtIndex(0)->url());
// The session id of the new tab should be that of the old, and the old should
- // be set to 0.
+ // get a new id.
EXPECT_EQ(id.id(), other_controller.session_id().id());
- EXPECT_EQ(0, controller().session_id().id());
+ EXPECT_NE(id.id(), controller().session_id().id());
}
// Test CopyStateFromAndPrune with 2 urls, the first selected and nothing in
@@ -1807,9 +1807,9 @@ TEST_F(NavigationControllerTest, CopyStateFromAndPrune3) {
EXPECT_EQ(url3, other_controller.pending_entry()->url());
// The session id of the new tab should be that of the old, and the old should
- // be set to 0.
+ // be get a new id.
EXPECT_EQ(id.id(), other_controller.session_id().id());
- EXPECT_EQ(0, controller().session_id().id());
+ EXPECT_NE(id.id(), controller().session_id().id());
}
// Tests that navigations initiated from the page (with the history object)
« no previous file with comments | « chrome/browser/tab_contents/navigation_controller.cc ('k') | chrome/browser/tab_contents/tab_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698