Commit 8a5592e8 authored by jochen@chromium.org's avatar jochen@chromium.org

Include the referrer policy in sync'd tab navigations

BUG=332169
R=zea@chromium.org

Review URL: https://codereview.chromium.org/128193002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243693 0039d316-1c4b-4281-b951-d872f2087c98
parent c0a2a5c2
...@@ -65,9 +65,9 @@ SerializedNavigationEntry SerializedNavigationEntry::FromSyncData( ...@@ -65,9 +65,9 @@ SerializedNavigationEntry SerializedNavigationEntry::FromSyncData(
SerializedNavigationEntry navigation; SerializedNavigationEntry navigation;
navigation.index_ = index; navigation.index_ = index;
navigation.unique_id_ = sync_data.unique_id(); navigation.unique_id_ = sync_data.unique_id();
navigation.referrer_ = navigation.referrer_ = content::Referrer(
content::Referrer(GURL(sync_data.referrer()), GURL(sync_data.referrer()),
blink::WebReferrerPolicyDefault); static_cast<blink::WebReferrerPolicy>(sync_data.referrer_policy()));
navigation.virtual_url_ = GURL(sync_data.virtual_url()); navigation.virtual_url_ = GURL(sync_data.virtual_url());
navigation.title_ = base::UTF8ToUTF16(sync_data.title()); navigation.title_ = base::UTF8ToUTF16(sync_data.title());
navigation.page_state_ = navigation.page_state_ =
...@@ -366,8 +366,8 @@ scoped_ptr<NavigationEntry> SerializedNavigationEntry::ToNavigationEntry( ...@@ -366,8 +366,8 @@ scoped_ptr<NavigationEntry> SerializedNavigationEntry::ToNavigationEntry(
sync_pb::TabNavigation SerializedNavigationEntry::ToSyncData() const { sync_pb::TabNavigation SerializedNavigationEntry::ToSyncData() const {
sync_pb::TabNavigation sync_data; sync_pb::TabNavigation sync_data;
sync_data.set_virtual_url(virtual_url_.spec()); sync_data.set_virtual_url(virtual_url_.spec());
// FIXME(zea): Support referrer policy?
sync_data.set_referrer(referrer_.url.spec()); sync_data.set_referrer(referrer_.url.spec());
sync_data.set_referrer_policy(referrer_.policy);
sync_data.set_title(base::UTF16ToUTF8(title_)); sync_data.set_title(base::UTF16ToUTF8(title_));
// Page transition core. // Page transition core.
......
...@@ -78,6 +78,7 @@ sync_pb::TabNavigation MakeSyncDataForTest() { ...@@ -78,6 +78,7 @@ sync_pb::TabNavigation MakeSyncDataForTest() {
sync_pb::TabNavigation sync_data; sync_pb::TabNavigation sync_data;
sync_data.set_virtual_url(kVirtualURL.spec()); sync_data.set_virtual_url(kVirtualURL.spec());
sync_data.set_referrer(kReferrer.url.spec()); sync_data.set_referrer(kReferrer.url.spec());
sync_data.set_referrer_policy(blink::WebReferrerPolicyOrigin);
sync_data.set_title(base::UTF16ToUTF8(kTitle)); sync_data.set_title(base::UTF16ToUTF8(kTitle));
sync_data.set_state(kPageState.ToEncodedData()); sync_data.set_state(kPageState.ToEncodedData());
sync_data.set_page_transition( sync_data.set_page_transition(
...@@ -153,7 +154,7 @@ TEST(SerializedNavigationEntryTest, FromSyncData) { ...@@ -153,7 +154,7 @@ TEST(SerializedNavigationEntryTest, FromSyncData) {
EXPECT_EQ(kIndex, navigation.index()); EXPECT_EQ(kIndex, navigation.index());
EXPECT_EQ(kUniqueID, navigation.unique_id()); EXPECT_EQ(kUniqueID, navigation.unique_id());
EXPECT_EQ(kReferrer.url, navigation.referrer().url); EXPECT_EQ(kReferrer.url, navigation.referrer().url);
EXPECT_EQ(blink::WebReferrerPolicyDefault, navigation.referrer().policy); EXPECT_EQ(blink::WebReferrerPolicyOrigin, navigation.referrer().policy);
EXPECT_EQ(kVirtualURL, navigation.virtual_url()); EXPECT_EQ(kVirtualURL, navigation.virtual_url());
EXPECT_EQ(kTitle, navigation.title()); EXPECT_EQ(kTitle, navigation.title());
EXPECT_EQ(kPageState, navigation.page_state()); EXPECT_EQ(kPageState, navigation.page_state());
......
...@@ -202,6 +202,7 @@ base::DictionaryValue* TabNavigationToValue( ...@@ -202,6 +202,7 @@ base::DictionaryValue* TabNavigationToValue(
SET_ENUM(blocked_state, GetBlockedStateString); SET_ENUM(blocked_state, GetBlockedStateString);
SET_STR_REP(content_pack_categories); SET_STR_REP(content_pack_categories);
SET_INT32(http_status_code); SET_INT32(http_status_code);
SET_INT32(referrer_policy);
return value; return value;
} }
......
...@@ -134,4 +134,6 @@ message TabNavigation { ...@@ -134,4 +134,6 @@ message TabNavigation {
repeated string content_pack_categories = 19; repeated string content_pack_categories = 19;
// The status code from the last navigation. // The status code from the last navigation.
optional int32 http_status_code = 20; optional int32 http_status_code = 20;
// Referrer policy.
optional int32 referrer_policy = 21;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment