Move ownership of source SiteInstance to the FrameNavigationEntry.

content/browser/frame_host/frame_navigation_entry.cc

 // Copyright 2015 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 "content/browser/frame_host/frame_navigation_entry.h"
 
 #include <utility>
 
 namespace content {
 
 FrameNavigationEntry::FrameNavigationEntry()
     : item_sequence_number_(-1), document_sequence_number_(-1), post_id_(-1) {}
 
 FrameNavigationEntry::FrameNavigationEntry(
     const std::string& frame_unique_name,
     int64_t item_sequence_number,
     int64_t document_sequence_number,
     scoped_refptr<SiteInstanceImpl> site_instance,
+    scoped_refptr<SiteInstanceImpl> source_site_instance,
     const GURL& url,
     const Referrer& referrer,
     const std::string& method,
     int64_t post_id)
     : frame_unique_name_(frame_unique_name),
       item_sequence_number_(item_sequence_number),
       document_sequence_number_(document_sequence_number),
       site_instance_(std::move(site_instance)),
+      source_site_instance_(std::move(source_site_instance)),
       url_(url),
       referrer_(referrer),
       method_(method),
       post_id_(post_id) {}
 
 FrameNavigationEntry::~FrameNavigationEntry() {
 }
 
 FrameNavigationEntry* FrameNavigationEntry::Clone() const {
   FrameNavigationEntry* copy = new FrameNavigationEntry();
   copy->UpdateEntry(frame_unique_name_, item_sequence_number_,
-                    document_sequence_number_, site_instance_.get(), url_,
-                    referrer_, page_state_, method_, post_id_);
+                    document_sequence_number_, site_instance_.get(),
+                    source_site_instance_, url_, referrer_, page_state_,

[Charlie Reis, 2016/05/05 22:20:00]

Hmm.  NavigationEntryImpl::CloneAndReplace omits any fields that get cleared at
commit time, and I think that's probably the right thing to do here for
FrameNavigationEntry::Clone().  

We're losing the formatting from NavigationEntryImpl::CloneAndReplace where we
could put a comment for any omitted field (in order), but here we can just pass
null for the ones that get omitted.  Maybe we can preface this UpdateEntry call
with:
// Omit any fields cleared in ResetForCommit.

(I think we do need to have listed in UpdateEntry below, so that it gets set via
AddOrUpdateFrameEntry on transfers.)

[nasko, 2016/05/06 00:13:41]

Done.

+                    method_, post_id_);
   return copy;
 }
 
-void FrameNavigationEntry::UpdateEntry(const std::string& frame_unique_name,
-                                       int64_t item_sequence_number,
-                                       int64_t document_sequence_number,
-                                       SiteInstanceImpl* site_instance,
-                                       const GURL& url,
-                                       const Referrer& referrer,
-                                       const PageState& page_state,
-                                       const std::string& method,
-                                       int64_t post_id) {
+void FrameNavigationEntry::UpdateEntry(
+    const std::string& frame_unique_name,
+    int64_t item_sequence_number,
+    int64_t document_sequence_number,
+    SiteInstanceImpl* site_instance,

[Charlie Reis, 2016/05/05 22:20:00]

Tangent for a different CL: Perhaps we should change this to scoped_refptr to be
consistent?

[nasko, 2016/05/06 00:13:41]

My preference is different CL, as I want to keep this one to be move only CL.

+    scoped_refptr<SiteInstanceImpl> source_site_instance,
+    const GURL& url,
+    const Referrer& referrer,
+    const PageState& page_state,
+    const std::string& method,
+    int64_t post_id) {
   frame_unique_name_ = frame_unique_name;
   item_sequence_number_ = item_sequence_number;
   document_sequence_number_ = document_sequence_number;
   site_instance_ = site_instance;
+  source_site_instance_ = std::move(source_site_instance);
   url_ = url;
   referrer_ = referrer;
   page_state_ = page_state;
   method_ = method;
   post_id_ = post_id;
 }
 
 void FrameNavigationEntry::set_item_sequence_number(
     int64_t item_sequence_number) {
   // TODO(creis): Assert that this does not change after being assigned, once
   // location.replace is classified as NEW_PAGE rather than EXISTING_PAGE.
   // Same for document sequence number.  See https://crbug.com/596707.
   item_sequence_number_ = item_sequence_number;
 }
 
 void FrameNavigationEntry::set_document_sequence_number(
     int64_t document_sequence_number) {
   document_sequence_number_ = document_sequence_number;
 }
 
 }  // namespace content