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

chrome/browser/sessions/base_session_service.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 "chrome/browser/sessions/base_session_service.h"
 
 #include "base/bind.h"
 #include "base/pickle.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/navigation_entry.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebReferrerPolicy.h"
 #include "webkit/glue/webkit_glue.h"
 
+using WebKit::WebReferrerPolicy;
+
 // InternalGetCommandsRequest -------------------------------------------------
 
 BaseSessionService::InternalGetCommandsRequest::~InternalGetCommandsRequest() {
   STLDeleteElements(&commands);
 }
 
 // BaseSessionService ---------------------------------------------------------
 
 namespace {
 
@@ skipping 142 matching lines @@
   } else {
     WriteStringToPickle(pickle, &bytes_written, max_state_size,
                         entry.content_state());
   }
 
   pickle.WriteInt(entry.transition_type());
   int type_mask = entry.has_post_data() ? TabNavigation::HAS_POST_DATA : 0;
   pickle.WriteInt(type_mask);
 
   WriteStringToPickle(pickle, &bytes_written, max_state_size,
-      entry.referrer().is_valid() ? entry.referrer().spec() : std::string());
+      entry.referrer().url.is_valid() ?
+          entry.referrer().url.spec() : std::string());
+  pickle.WriteInt(entry.referrer().policy);
 
   // Adding more data? Be sure and update TabRestoreService too.
   return new SessionCommand(command_id, pickle);
 }
 
 SessionCommand* BaseSessionService::CreateSetTabExtensionAppIDCommand(
     SessionID::id_type command_id,
     SessionID::id_type tab_id,
     const std::string& extension_id) {
   // Use pickle to handle marshalling.
@@ skipping 30 matching lines @@
     return false;
   // type_mask did not always exist in the written stream. As such, we
   // don't fail if it can't be read.
   bool has_type_mask = pickle->ReadInt(&iterator, &(navigation->type_mask_));
 
   if (has_type_mask) {
     // the "referrer" property was added after type_mask to the written
     // stream. As such, we don't fail if it can't be read.
     std::string referrer_spec;
     pickle->ReadString(&iterator, &referrer_spec);
-    if (!referrer_spec.empty())
-      navigation->referrer_ = GURL(referrer_spec);
+    // The "referrer policy" property was added even later, so we fall back to
+    // the default policy if the property is not present.
+    int policy_int;
+    WebReferrerPolicy policy;
+    if (pickle->ReadInt(&iterator, &policy_int))
+      policy = static_cast<WebReferrerPolicy>(policy_int);
+    else
+      policy = WebKit::WebReferrerPolicyDefault;
+    navigation->referrer_ = content::Referrer(
+        referrer_spec.empty() ? GURL() : GURL(referrer_spec),
+        policy);
   }
 
   navigation->virtual_url_ = GURL(url_spec);
   return true;
 }
 
 bool BaseSessionService::RestoreSetTabExtensionAppIDCommand(
     const SessionCommand& command,
     SessionID::id_type* tab_id,
     std::string* extension_app_id) {
@@ skipping 37 matching lines @@
   if (backend_thread()) {
     backend_thread()->message_loop()->PostTask(
         FROM_HERE,
         base::Bind(&SessionBackend::ReadCurrentSessionCommands, backend(),
                    request_wrapper));
   } else {
     backend()->ReadCurrentSessionCommands(request);
   }
   return request->handle();
 }