Make NavigationEntry and friends use content::Referrer instead of plain URLs

chrome/browser/sync/glue/session_model_associator_unittest.cc

Index: chrome/browser/sync/glue/session_model_associator_unittest.cc
diff --git a/chrome/browser/sync/glue/session_model_associator_unittest.cc b/chrome/browser/sync/glue/session_model_associator_unittest.cc
index 3928958e45d05626cd371b31e19123e3af020ccd..959d78d358359791c0b6642f996bb0b27f2030f0 100644
--- a/chrome/browser/sync/glue/session_model_associator_unittest.cc
+++ b/chrome/browser/sync/glue/session_model_associator_unittest.cc
@@ -22,7 +22,9 @@ TEST_F(SessionModelAssociatorTest, SessionWindowHasNoTabsToSync) {
   scoped_ptr<SessionTab> tab(new SessionTab());
   win.tabs.push_back(tab.release());
   ASSERT_TRUE(SessionWindowHasNoTabsToSync(win));
-  TabNavigation nav(0, GURL("about:bubba"), GURL("about:referrer"),
+  TabNavigation nav(0, GURL("about:bubba"),
+                    content::Referrer(GURL("about:referrer"),
+                                      WebKit::WebReferrerPolicyDefault),
                     string16(ASCIIToUTF16("title")),
                     std::string("state"), content::PageTransitionFromInt(0));
   win.tabs[0]->navigations.push_back(nav);
@@ -33,14 +35,16 @@ TEST_F(SessionModelAssociatorTest, IsValidSessionTab) {
   SessionTab tab;
   ASSERT_FALSE(IsValidSessionTab(tab));
   TabNavigation nav(0, GURL(chrome::kChromeUINewTabURL),
-                    GURL("about:referrer"),
+                    content::Referrer(GURL("about:referrer"),
+                                      WebKit::WebReferrerPolicyDefault),
                     string16(ASCIIToUTF16("title")),
                     std::string("state"), content::PageTransitionFromInt(0));
   tab.navigations.push_back(nav);
   // NewTab does not count as valid if it's the only navigation.
   ASSERT_FALSE(IsValidSessionTab(tab));
   TabNavigation nav2(0, GURL("about:bubba"),
-                    GURL("about:referrer"),
+                     content::Referrer(GURL("about:referrer"),
+                                       WebKit::WebReferrerPolicyDefault),
                     string16(ASCIIToUTF16("title")),
                     std::string("state"), content::PageTransitionFromInt(0));
   tab.navigations.push_back(nav2);
@@ -53,7 +57,8 @@ TEST_F(SessionModelAssociatorTest, IsValidSessionTabIgnoresFragmentForNtp) {
   ASSERT_FALSE(IsValidSessionTab(tab));
   TabNavigation nav(0, GURL(std::string(chrome::kChromeUINewTabURL) +
                             "#bookmarks"),
-                    GURL("about:referrer"),
+                    content::Referrer(GURL("about:referrer"),
+                                      WebKit::WebReferrerPolicyDefault),
                     string16(ASCIIToUTF16("title")),
                     std::string("state"), content::PageTransitionFromInt(0));
   tab.navigations.push_back(nav);
@@ -118,7 +123,7 @@ TEST_F(SessionModelAssociatorTest, PopulateSessionTab) {
   ASSERT_TRUE(tab.pinned);
   ASSERT_EQ("app_id", tab.extension_app_id);
   ASSERT_EQ(12, tab.navigations[0].index());
-  ASSERT_EQ(GURL("referrer"), tab.navigations[0].referrer());
+  ASSERT_EQ(GURL("referrer"), tab.navigations[0].referrer().url);
   ASSERT_EQ(string16(ASCIIToUTF16("title")), tab.navigations[0].title());
   ASSERT_EQ(content::PAGE_TRANSITION_TYPED, tab.navigations[0].transition());
   ASSERT_EQ(GURL("http://foo/1"), tab.navigations[0].virtual_url());