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

chrome/browser/sync/glue/session_model_associator_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/common/page_transition_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace browser_sync {
 
 typedef testing::Test SessionModelAssociatorTest;
 
 TEST_F(SessionModelAssociatorTest, SessionWindowHasNoTabsToSync) {
   SessionWindow win;
   ASSERT_TRUE(SessionWindowHasNoTabsToSync(win));
   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);
   ASSERT_FALSE(SessionWindowHasNoTabsToSync(win));
 }
 
 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);
   // Once there's another navigation, the tab is valid.
   ASSERT_TRUE(IsValidSessionTab(tab));
 }
 
 TEST_F(SessionModelAssociatorTest, IsValidSessionTabIgnoresFragmentForNtp) {
   SessionTab tab;
   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);
   // NewTab does not count as valid if it's the only navigation.
   ASSERT_FALSE(IsValidSessionTab(tab));
 }
 
 TEST_F(SessionModelAssociatorTest, PopulateSessionHeader) {
   sync_pb::SessionHeader header_s;
   header_s.set_client_name("Client 1");
@@ skipping 44 matching lines @@
   SessionTab tab;
   tab.tab_id.set_id(5);  // Expected to be set by the SyncedSessionTracker.
   SessionModelAssociator::PopulateSessionTabFromSpecifics(
       tab_s, base::Time(), &tab);
   ASSERT_EQ(5, tab.tab_id.id());
   ASSERT_EQ(13, tab.tab_visual_index);
   ASSERT_EQ(3, tab.current_navigation_index);
   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());
 }
 
 TEST_F(SessionModelAssociatorTest, TabNodePool) {
   SessionModelAssociator::TabNodePool pool(NULL);
   pool.set_machine_tag("tag");
   ASSERT_TRUE(pool.empty());
   ASSERT_TRUE(pool.full());
@@ skipping 34 matching lines @@
   ASSERT_FALSE(pool.empty());
   ASSERT_TRUE(pool.full());
   ASSERT_EQ(2U, pool.capacity());
   pool.clear();
   ASSERT_TRUE(pool.empty());
   ASSERT_TRUE(pool.full());
   ASSERT_EQ(0U, pool.capacity());
 }
 
 }  // namespace browser_sync