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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sessions/session_service_unittest.cc

Issue 10917231: Revamp TabNavigation class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Mac Created 8 years, 3 months 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/sessions/session_service_test_helper.cc ('k') | chrome/browser/sessions/session_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sessions/session_service_unittest.cc
diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc
index 748ee7a14cd54810657a64b7e76f75b4d53f51db..3152b3bda97dec126474dc7eb33f210714c80926 100644
--- a/chrome/browser/sessions/session_service_unittest.cc
+++ b/chrome/browser/sessions/session_service_unittest.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/sessions/session_service.h"
#include "chrome/browser/sessions/session_service_test_helper.h"
#include "chrome/browser/sessions/session_types.h"
+#include "chrome/browser/sessions/session_types_test_helper.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/test/base/browser_with_test_window_test.h"
@@ -75,21 +76,12 @@ class SessionServiceTest : public BrowserWithTestWindowTest,
void UpdateNavigation(const SessionID& window_id,
const SessionID& tab_id,
const TabNavigation& navigation,
- int index,
bool select) {
- scoped_ptr<NavigationEntry> entry(NavigationEntry::Create());
- entry->SetURL(navigation.virtual_url());
- entry->SetReferrer(navigation.referrer());
- entry->SetTitle(navigation.title());
- entry->SetContentState(navigation.state());
- entry->SetTransitionType(navigation.transition());
- entry->SetHasPostData(
- navigation.type_mask() & TabNavigation::HAS_POST_DATA);
- entry->SetOriginalRequestURL(navigation.original_request_url());
- entry->SetIsOverridingUserAgent(navigation.is_overriding_user_agent());
- service()->UpdateTabNavigation(window_id, tab_id, index, *entry.get());
- if (select)
- service()->SetSelectedNavigationIndex(window_id, tab_id, index);
+ service()->UpdateTabNavigation(window_id, tab_id, navigation);
+ if (select) {
+ service()->SetSelectedNavigationIndex(
+ window_id, tab_id, navigation.index());
+ }
}
void ReadWindows(std::vector<SessionWindow*>* windows) {
@@ -107,14 +99,11 @@ class SessionServiceTest : public BrowserWithTestWindowTest,
// and the pinned state of the read back tab is returned.
bool CreateAndWriteSessionWithOneTab(bool pinned_state, bool write_always) {
SessionID tab_id;
- TabNavigation nav1(0, GURL("http://google.com"),
- content::Referrer(GURL("http://www.referrer.com"),
- WebKit::WebReferrerPolicyDefault),
- ASCIIToUTF16("abc"), "def",
- content::PAGE_TRANSITION_QUALIFIER_MASK);
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
- UpdateNavigation(window_id, tab_id, nav1, 0, true);
+ UpdateNavigation(window_id, tab_id, nav1, true);
if (pinned_state || write_always)
helper_.service()->SetPinnedState(window_id, tab_id, pinned_state);
@@ -156,15 +145,13 @@ TEST_F(SessionServiceTest, Basic) {
SessionID tab_id;
ASSERT_NE(window_id.id(), tab_id.id());
- TabNavigation nav1(0, GURL("http://google.com"),
- content::Referrer(GURL("http://www.referrer.com"),
- WebKit::WebReferrerPolicyDefault),
- ASCIIToUTF16("abc"), "def",
- content::PAGE_TRANSITION_QUALIFIER_MASK);
- nav1.set_original_request_url(GURL("http://original.request.com"));
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
+ SessionTypesTestHelper::SetOriginalRequestURL(
+ &nav1, GURL("http://original.request.com"));
helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
- UpdateNavigation(window_id, tab_id, nav1, 0, true);
+ UpdateNavigation(window_id, tab_id, nav1, true);
ScopedVector<SessionWindow> windows;
ReadWindows(&(windows.get()));
@@ -187,13 +174,12 @@ TEST_F(SessionServiceTest, PersistPostData) {
SessionID tab_id;
ASSERT_NE(window_id.id(), tab_id.id());
- TabNavigation nav1(0, GURL("http://google.com"), content::Referrer(),
- ASCIIToUTF16("abc"), std::string(),
- content::PAGE_TRANSITION_QUALIFIER_MASK);
- nav1.set_type_mask(TabNavigation::HAS_POST_DATA);
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
+ SessionTypesTestHelper::SetHasPostData(&nav1, true);
helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
- UpdateNavigation(window_id, tab_id, nav1, 0, true);
+ UpdateNavigation(window_id, tab_id, nav1, true);
ScopedVector<SessionWindow> windows;
ReadWindows(&(windows.get()));
@@ -206,18 +192,16 @@ TEST_F(SessionServiceTest, ClosingTabStaysClosed) {
SessionID tab2_id;
ASSERT_NE(tab_id.id(), tab2_id.id());
- TabNavigation nav1(0, GURL("http://google.com"), content::Referrer(),
- ASCIIToUTF16("abc"), "def",
- content::PAGE_TRANSITION_QUALIFIER_MASK);
- TabNavigation nav2(0, GURL("http://google2.com"), content::Referrer(),
- ASCIIToUTF16("abcd"), "defg",
- content::PAGE_TRANSITION_AUTO_BOOKMARK);
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
+ TabNavigation nav2 =
+ SessionTypesTestHelper::CreateNavigation("http://google2.com", "abcd");
helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
- UpdateNavigation(window_id, tab_id, nav1, 0, true);
+ UpdateNavigation(window_id, tab_id, nav1, true);
helper_.PrepareTabInWindow(window_id, tab2_id, 1, false);
- UpdateNavigation(window_id, tab2_id, nav2, 0, true);
+ UpdateNavigation(window_id, tab2_id, nav2, true);
service()->TabClosed(window_id, tab2_id, false);
ScopedVector<SessionWindow> windows;
@@ -237,17 +221,16 @@ TEST_F(SessionServiceTest, ClosingTabStaysClosed) {
TEST_F(SessionServiceTest, Pruning) {
SessionID tab_id;
- TabNavigation nav1(0, GURL("http://google.com"), content::Referrer(),
- ASCIIToUTF16("abc"), "def",
- content::PAGE_TRANSITION_QUALIFIER_MASK);
- TabNavigation nav2(0, GURL("http://google2.com"), content::Referrer(),
- ASCIIToUTF16("abcd"), "defg",
- content::PAGE_TRANSITION_AUTO_BOOKMARK);
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
+ TabNavigation nav2 =
+ SessionTypesTestHelper::CreateNavigation("http://google2.com", "abcd");
helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
for (int i = 0; i < 6; ++i) {
- TabNavigation& nav = (i % 2) == 0 ? nav1 : nav2;
- UpdateNavigation(window_id, tab_id, nav, i, true);
+ TabNavigation* nav = (i % 2) == 0 ? &nav1 : &nav2;
+ nav->set_index(i);
+ UpdateNavigation(window_id, tab_id, *nav, true);
}
service()->TabNavigationPathPrunedFromBack(window_id, tab_id, 3);
@@ -263,6 +246,7 @@ TEST_F(SessionServiceTest, Pruning) {
// index should get reset to last valid navigation, which is 2.
helper_.AssertTabEquals(window_id, tab_id, 0, 2, 3, *tab);
+ ASSERT_EQ(3u, tab->navigations.size());
helper_.AssertNavigationEquals(nav1, tab->navigations[0]);
helper_.AssertNavigationEquals(nav2, tab->navigations[1]);
helper_.AssertNavigationEquals(nav1, tab->navigations[2]);
@@ -273,15 +257,13 @@ TEST_F(SessionServiceTest, TwoWindows) {
SessionID tab1_id;
SessionID tab2_id;
- TabNavigation nav1(0, GURL("http://google.com"), content::Referrer(),
- ASCIIToUTF16("abc"), "def",
- content::PAGE_TRANSITION_QUALIFIER_MASK);
- TabNavigation nav2(0, GURL("http://google2.com"), content::Referrer(),
- ASCIIToUTF16("abcd"), "defg",
- content::PAGE_TRANSITION_AUTO_BOOKMARK);
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
+ TabNavigation nav2 =
+ SessionTypesTestHelper::CreateNavigation("http://google2.com", "abcd");
helper_.PrepareTabInWindow(window_id, tab1_id, 0, true);
- UpdateNavigation(window_id, tab1_id, nav1, 0, true);
+ UpdateNavigation(window_id, tab1_id, nav1, true);
const gfx::Rect window2_bounds(3, 4, 5, 6);
service()->SetWindowType(
@@ -290,7 +272,7 @@ TEST_F(SessionServiceTest, TwoWindows) {
window2_bounds,
ui::SHOW_STATE_MAXIMIZED);
helper_.PrepareTabInWindow(window2_id, tab2_id, 0, true);
- UpdateNavigation(window2_id, tab2_id, nav2, 0, true);
+ UpdateNavigation(window2_id, tab2_id, nav2, true);
ScopedVector<SessionWindow> windows;
ReadWindows(&(windows.get()));
@@ -331,12 +313,11 @@ TEST_F(SessionServiceTest, WindowWithNoTabsGetsPruned) {
SessionID tab1_id;
SessionID tab2_id;
- TabNavigation nav1(0, GURL("http://google.com"), content::Referrer(),
- ASCIIToUTF16("abc"), "def",
- content::PAGE_TRANSITION_QUALIFIER_MASK);
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
helper_.PrepareTabInWindow(window_id, tab1_id, 0, true);
- UpdateNavigation(window_id, tab1_id, nav1, 0, true);
+ UpdateNavigation(window_id, tab1_id, nav1, true);
const gfx::Rect window2_bounds(3, 4, 5, 6);
service()->SetWindowType(
@@ -364,18 +345,16 @@ TEST_F(SessionServiceTest, ClosingWindowDoesntCloseTabs) {
SessionID tab2_id;
ASSERT_NE(tab_id.id(), tab2_id.id());
- TabNavigation nav1(0, GURL("http://google.com"), content::Referrer(),
- ASCIIToUTF16("abc"), "def",
- content::PAGE_TRANSITION_QUALIFIER_MASK);
- TabNavigation nav2(0, GURL("http://google2.com"), content::Referrer(),
- ASCIIToUTF16("abcd"), "defg",
- content::PAGE_TRANSITION_AUTO_BOOKMARK);
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
+ TabNavigation nav2 =
+ SessionTypesTestHelper::CreateNavigation("http://google2.com", "abcd");
helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
- UpdateNavigation(window_id, tab_id, nav1, 0, true);
+ UpdateNavigation(window_id, tab_id, nav1, true);
helper_.PrepareTabInWindow(window_id, tab2_id, 1, false);
- UpdateNavigation(window_id, tab2_id, nav2, 0, true);
+ UpdateNavigation(window_id, tab2_id, nav2, true);
service()->WindowClosing(window_id);
@@ -408,18 +387,16 @@ TEST_F(SessionServiceTest, WindowCloseCommittedAfterNavigate) {
window_bounds,
ui::SHOW_STATE_NORMAL);
- TabNavigation nav1(0, GURL("http://google.com"), content::Referrer(),
- ASCIIToUTF16("abc"), "def",
- content::PAGE_TRANSITION_QUALIFIER_MASK);
- TabNavigation nav2(0, GURL("http://google2.com"), content::Referrer(),
- ASCIIToUTF16("abcd"), "defg",
- content::PAGE_TRANSITION_AUTO_BOOKMARK);
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
+ TabNavigation nav2 =
+ SessionTypesTestHelper::CreateNavigation("http://google2.com", "abcd");
helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
- UpdateNavigation(window_id, tab_id, nav1, 0, true);
+ UpdateNavigation(window_id, tab_id, nav1, true);
helper_.PrepareTabInWindow(window2_id, tab2_id, 0, false);
- UpdateNavigation(window2_id, tab2_id, nav2, 0, true);
+ UpdateNavigation(window2_id, tab2_id, nav2, true);
service()->WindowClosing(window2_id);
service()->TabClosed(window2_id, tab2_id, false);
@@ -454,18 +431,16 @@ TEST_F(SessionServiceTest, IgnorePopups) {
window_bounds,
ui::SHOW_STATE_NORMAL);
- TabNavigation nav1(0, GURL("http://google.com"), content::Referrer(),
- ASCIIToUTF16("abc"), "def",
- content::PAGE_TRANSITION_QUALIFIER_MASK);
- TabNavigation nav2(0, GURL("http://google2.com"), content::Referrer(),
- ASCIIToUTF16("abcd"), "defg",
- content::PAGE_TRANSITION_AUTO_BOOKMARK);
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
+ TabNavigation nav2 =
+ SessionTypesTestHelper::CreateNavigation("http://google2.com", "abcd");
helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
- UpdateNavigation(window_id, tab_id, nav1, 0, true);
+ UpdateNavigation(window_id, tab_id, nav1, true);
helper_.PrepareTabInWindow(window2_id, tab2_id, 0, false);
- UpdateNavigation(window2_id, tab2_id, nav2, 0, true);
+ UpdateNavigation(window2_id, tab2_id, nav2, true);
ScopedVector<SessionWindow> windows;
ReadWindows(&(windows.get()));
@@ -496,18 +471,16 @@ TEST_F(SessionServiceTest, RestorePopup) {
window_bounds,
ui::SHOW_STATE_NORMAL);
- TabNavigation nav1(0, GURL("http://google.com"), content::Referrer(),
- ASCIIToUTF16("abc"), "def",
- content::PAGE_TRANSITION_QUALIFIER_MASK);
- TabNavigation nav2(0, GURL("http://google2.com"), content::Referrer(),
- ASCIIToUTF16("abcd"), "defg",
- content::PAGE_TRANSITION_AUTO_BOOKMARK);
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
+ TabNavigation nav2 =
+ SessionTypesTestHelper::CreateNavigation("http://google2.com", "abcd");
helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
- UpdateNavigation(window_id, tab_id, nav1, 0, true);
+ UpdateNavigation(window_id, tab_id, nav1, true);
helper_.PrepareTabInWindow(window2_id, tab2_id, 0, false);
- UpdateNavigation(window2_id, tab2_id, nav2, 0, true);
+ UpdateNavigation(window2_id, tab2_id, nav2, true);
ScopedVector<SessionWindow> windows;
ReadWindows(&(windows.get()));
@@ -548,18 +521,16 @@ TEST_F(SessionServiceTest, RestoreApp) {
ui::SHOW_STATE_NORMAL);
service()->SetWindowAppName(window2_id, "TestApp");
- TabNavigation nav1(0, GURL("http://google.com"), content::Referrer(),
- ASCIIToUTF16("abc"), "def",
- content::PAGE_TRANSITION_QUALIFIER_MASK);
- TabNavigation nav2(0, GURL("http://google2.com"), content::Referrer(),
- ASCIIToUTF16("abcd"), "defg",
- content::PAGE_TRANSITION_AUTO_BOOKMARK);
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
+ TabNavigation nav2 =
+ SessionTypesTestHelper::CreateNavigation("http://google2.com", "abcd");
helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
- UpdateNavigation(window_id, tab_id, nav1, 0, true);
+ UpdateNavigation(window_id, tab_id, nav1, true);
helper_.PrepareTabInWindow(window2_id, tab2_id, 0, false);
- UpdateNavigation(window2_id, tab2_id, nav2, 0, true);
+ UpdateNavigation(window2_id, tab2_id, nav2, true);
ScopedVector<SessionWindow> windows;
ReadWindows(&(windows.get()));
@@ -597,11 +568,11 @@ TEST_F(SessionServiceTest, PruneFromFront) {
// Add 5 navigations, with the 4th selected.
for (int i = 0; i < 5; ++i) {
- TabNavigation nav(0, GURL(base_url + base::IntToString(i)),
- content::Referrer(),
- ASCIIToUTF16("a"), "b",
- content::PAGE_TRANSITION_QUALIFIER_MASK);
- UpdateNavigation(window_id, tab_id, nav, i, (i == 3));
+ TabNavigation nav =
+ SessionTypesTestHelper::CreateNavigation(
+ base_url + base::IntToString(i), "a");
+ nav.set_index(i);
+ UpdateNavigation(window_id, tab_id, nav, (i == 3));
}
// Prune the first two navigations from the front.
@@ -640,11 +611,11 @@ TEST_F(SessionServiceTest, PruneToEmpty) {
// Add 5 navigations, with the 4th selected.
for (int i = 0; i < 5; ++i) {
- TabNavigation nav(0, GURL(base_url + base::IntToString(i)),
- content::Referrer(),
- ASCIIToUTF16("a"), "b",
- content::PAGE_TRANSITION_QUALIFIER_MASK);
- UpdateNavigation(window_id, tab_id, nav, i, (i == 3));
+ TabNavigation nav =
+ SessionTypesTestHelper::CreateNavigation(
+ base_url + base::IntToString(i), "a");
+ nav.set_index(i);
+ UpdateNavigation(window_id, tab_id, nav, (i == 3));
}
// Prune the first two navigations from the front.
@@ -678,12 +649,11 @@ TEST_F(SessionServiceTest, PersistApplicationExtensionID) {
ASSERT_NE(window_id.id(), tab_id.id());
std::string app_id("foo");
- TabNavigation nav1(0, GURL("http://google.com"), content::Referrer(),
- ASCIIToUTF16("abc"), std::string(),
- content::PAGE_TRANSITION_QUALIFIER_MASK);
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
- UpdateNavigation(window_id, tab_id, nav1, 0, true);
+ UpdateNavigation(window_id, tab_id, nav1, true);
helper_.SetTabExtensionAppID(window_id, tab_id, app_id);
ScopedVector<SessionWindow> windows;
@@ -701,13 +671,12 @@ TEST_F(SessionServiceTest, PersistUserAgentOverrides) {
"AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.45 "
"Safari/535.19";
- TabNavigation nav1(0, GURL("http://google.com"), content::Referrer(),
- ASCIIToUTF16("abc"), std::string(),
- content::PAGE_TRANSITION_QUALIFIER_MASK);
- nav1.set_is_overriding_user_agent(true);
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
+ SessionTypesTestHelper::SetIsOverridingUserAgent(&nav1, true);
helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
- UpdateNavigation(window_id, tab_id, nav1, 0, true);
+ UpdateNavigation(window_id, tab_id, nav1, true);
helper_.SetTabUserAgentOverride(window_id, tab_id, user_agent_override);
ScopedVector<SessionWindow> windows;
@@ -734,14 +703,11 @@ TEST_F(SessionServiceTest, CloseTabUserGesture) {
SessionID tab_id;
ASSERT_NE(window_id.id(), tab_id.id());
- TabNavigation nav1(0, GURL("http://google.com"),
- content::Referrer(GURL("http://www.referrer.com"),
- WebKit::WebReferrerPolicyDefault),
- ASCIIToUTF16("abc"), "def",
- content::PAGE_TRANSITION_QUALIFIER_MASK);
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
- UpdateNavigation(window_id, tab_id, nav1, 0, true);
+ UpdateNavigation(window_id, tab_id, nav1, true);
service()->TabClosed(window_id, tab_id, true);
ScopedVector<SessionWindow> windows;
@@ -754,13 +720,10 @@ TEST_F(SessionServiceTest, CloseTabUserGesture) {
TEST_F(SessionServiceTest, DontPersistDefault) {
SessionID tab_id;
ASSERT_NE(window_id.id(), tab_id.id());
- TabNavigation nav1(0, GURL("http://google.com"),
- content::Referrer(GURL("http://www.referrer.com"),
- WebKit::WebReferrerPolicyDefault),
- ASCIIToUTF16("abc"), "def",
- content::PAGE_TRANSITION_QUALIFIER_MASK);
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
- UpdateNavigation(window_id, tab_id, nav1, 0, true);
+ UpdateNavigation(window_id, tab_id, nav1, true);
service()->SetWindowBounds(window_id,
window_bounds,
ui::SHOW_STATE_DEFAULT);
@@ -787,20 +750,22 @@ TEST_F(SessionServiceTest, KeepPostDataWithoutPasswords) {
// Create a TabNavigation containing content_state and representing a POST
// request.
- TabNavigation nav1(0, GURL("http://google.com"), content::Referrer(),
- ASCIIToUTF16("title"), content_state,
- content::PAGE_TRANSITION_QUALIFIER_MASK);
- nav1.set_type_mask(TabNavigation::HAS_POST_DATA);
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "title");
+ SessionTypesTestHelper::SetContentState(&nav1, content_state);
+ SessionTypesTestHelper::SetHasPostData(&nav1, true);
// Create a TabNavigation containing content_state and representing a normal
// request.
- TabNavigation nav2(0, GURL("http://google.com/nopost"), content::Referrer(),
- ASCIIToUTF16("title"), content_state,
- content::PAGE_TRANSITION_QUALIFIER_MASK);
+ TabNavigation nav2 =
+ SessionTypesTestHelper::CreateNavigation(
+ "http://google.com/nopost", "title");
+ SessionTypesTestHelper::SetContentState(&nav2, content_state);
+ nav2.set_index(1);
helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
- UpdateNavigation(window_id, tab_id, nav1, 0, true);
- UpdateNavigation(window_id, tab_id, nav2, 1, true);
+ UpdateNavigation(window_id, tab_id, nav1, true);
+ UpdateNavigation(window_id, tab_id, nav2, true);
ScopedVector<SessionWindow> windows;
ReadWindows(&(windows.get()));
@@ -808,6 +773,7 @@ TEST_F(SessionServiceTest, KeepPostDataWithoutPasswords) {
helper_.AssertSingleWindowWithSingleTab(windows.get(), 2);
// Expected: the content state of both navigations was saved and restored.
+ ASSERT_EQ(2u, windows[0]->tabs[0]->navigations.size());
helper_.AssertNavigationEquals(nav1, windows[0]->tabs[0]->navigations[0]);
helper_.AssertNavigationEquals(nav2, windows[0]->tabs[0]->navigations[1]);
}
@@ -829,12 +795,12 @@ TEST_F(SessionServiceTest, RemovePostDataWithPasswords) {
// Create a TabNavigation containing content_state and representing a POST
// request with passwords.
- TabNavigation nav1(0, GURL("http://google.com"), content::Referrer(),
- ASCIIToUTF16("title"), content_state,
- content::PAGE_TRANSITION_QUALIFIER_MASK);
- nav1.set_type_mask(TabNavigation::HAS_POST_DATA);
+ TabNavigation nav1 =
+ SessionTypesTestHelper::CreateNavigation("http://google.com", "title");
+ SessionTypesTestHelper::SetContentState(&nav1, content_state);
+ SessionTypesTestHelper::SetHasPostData(&nav1, true);
helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
- UpdateNavigation(window_id, tab_id, nav1, 0, true);
+ UpdateNavigation(window_id, tab_id, nav1, true);
ScopedVector<SessionWindow> windows;
ReadWindows(&(windows.get()));
@@ -843,7 +809,7 @@ TEST_F(SessionServiceTest, RemovePostDataWithPasswords) {
// Expected: the HTTP body was removed from the content state of the POST
// navigation with passwords.
- EXPECT_NE(content_state, windows[0]->tabs[0]->navigations[0].state());
+ EXPECT_NE(content_state, windows[0]->tabs[0]->navigations[0].content_state());
}
// This test is only applicable to chromeos.
« no previous file with comments | « chrome/browser/sessions/session_service_test_helper.cc ('k') | chrome/browser/sessions/session_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698