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

content/browser/tab_contents/navigation_entry_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 "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class NavigationEntryTest : public testing::Test {
  public:
   NavigationEntryTest() : instance_(NULL) {
   }
 
   virtual void SetUp() {
     entry1_.reset(new NavigationEntry);
 
     instance_ = SiteInstance::CreateSiteInstance(NULL);
-    entry2_.reset(new NavigationEntry(instance_, 3,
-                                      GURL("test:url"),
-                                      GURL("from"),
-                                      ASCIIToUTF16("title"),
-                                      content::PAGE_TRANSITION_TYPED,
-                                      false));
+    entry2_.reset(new NavigationEntry(
+          instance_, 3,
+          GURL("test:url"),
+          content::Referrer(GURL("from"), WebKit::WebReferrerPolicyDefault),
+          ASCIIToUTF16("title"),
+          content::PAGE_TRANSITION_TYPED,
+          false));
   }
 
   virtual void TearDown() {
   }
 
  protected:
   scoped_ptr<NavigationEntry> entry1_;
   scoped_ptr<NavigationEntry> entry2_;
   // SiteInstances are deleted when their NavigationEntries are gone.
   SiteInstance* instance_;
@@ skipping 107 matching lines @@
   entry1_.get()->set_site_instance(instance_);
   EXPECT_EQ(instance_, entry1_.get()->site_instance());
 
   // Page type
   EXPECT_EQ(content::PAGE_TYPE_NORMAL, entry1_.get()->page_type());
   EXPECT_EQ(content::PAGE_TYPE_NORMAL, entry2_.get()->page_type());
   entry2_.get()->set_page_type(content::PAGE_TYPE_INTERSTITIAL);
   EXPECT_EQ(content::PAGE_TYPE_INTERSTITIAL, entry2_.get()->page_type());
 
   // Referrer
-  EXPECT_EQ(GURL(), entry1_.get()->referrer());
-  EXPECT_EQ(GURL("from"), entry2_.get()->referrer());
-  entry2_.get()->set_referrer(GURL("from2"));
-  EXPECT_EQ(GURL("from2"), entry2_.get()->referrer());
+  EXPECT_EQ(GURL(), entry1_.get()->referrer().url);
+  EXPECT_EQ(GURL("from"), entry2_.get()->referrer().url);
+  entry2_.get()->set_referrer(
+      content::Referrer(GURL("from2"), WebKit::WebReferrerPolicyDefault));
+  EXPECT_EQ(GURL("from2"), entry2_.get()->referrer().url);
 
   // Title
   EXPECT_EQ(string16(), entry1_.get()->title());
   EXPECT_EQ(ASCIIToUTF16("title"), entry2_.get()->title());
   entry2_.get()->set_title(ASCIIToUTF16("title2"));
   EXPECT_EQ(ASCIIToUTF16("title2"), entry2_.get()->title());
 
   // State
   EXPECT_EQ(std::string(), entry1_.get()->content_state());
   EXPECT_EQ(std::string(), entry2_.get()->content_state());
@@ skipping 23 matching lines @@
   EXPECT_FALSE(entry2_.get()->has_post_data());
   entry2_.get()->set_has_post_data(true);
   EXPECT_TRUE(entry2_.get()->has_post_data());
 
   // Restored
   EXPECT_EQ(NavigationEntry::RESTORE_NONE, entry1_->restore_type());
   EXPECT_EQ(NavigationEntry::RESTORE_NONE, entry2_->restore_type());
   entry2_->set_restore_type(NavigationEntry::RESTORE_LAST_SESSION);
   EXPECT_EQ(NavigationEntry::RESTORE_LAST_SESSION, entry2_->restore_type());
 }