Move ownership of source SiteInstance to the FrameNavigationEntry.

content/browser/frame_host/navigation_entry_impl.cc

Index: content/browser/frame_host/navigation_entry_impl.cc
diff --git a/content/browser/frame_host/navigation_entry_impl.cc b/content/browser/frame_host/navigation_entry_impl.cc
index eccc0640c1fd30864f28044fb1d0c2b6e0cd1908..4c5d77071a2c9c72b4311f8ab46b4aad52a71dde 100644
--- a/content/browser/frame_host/navigation_entry_impl.cc
+++ b/content/browser/frame_host/navigation_entry_impl.cc
@@ -333,11 +333,6 @@ void NavigationEntryImpl::set_site_instance(
   frame_tree_->frame_entry->set_site_instance(std::move(site_instance));
 }
 
-void NavigationEntryImpl::set_source_site_instance(
-    SiteInstanceImpl* source_site_instance) {
-  source_site_instance_ = source_site_instance;
-}
-
 void NavigationEntryImpl::SetBindings(int bindings) {
   // Ensure this is set to a valid value, and that it stays the same once set.
   CHECK_NE(bindings, kInvalidBindings);
@@ -663,13 +658,12 @@ RequestNavigationParams NavigationEntryImpl::ConstructRequestNavigationParams(
   return request_params;
 }
 
-void NavigationEntryImpl::ResetForCommit() {
+void NavigationEntryImpl::ResetForCommit(FrameNavigationEntry* frame_entry) {
   // Any state that only matters when a navigation entry is pending should be
   // cleared here.
   // TODO(creis): This state should be moved to NavigationRequest once
   // PlzNavigate is enabled.
   SetBrowserInitiatedPostData(nullptr);
-  set_source_site_instance(nullptr);
   set_is_renderer_initiated(false);
   set_transferred_global_request_id(GlobalRequestID());
   set_should_replace_entry(false);
@@ -677,6 +671,9 @@ void NavigationEntryImpl::ResetForCommit() {
   set_should_clear_history_list(false);
   set_frame_tree_node_id(-1);
 
+  if (frame_entry)
+    frame_entry->set_source_site_instance(nullptr);
+
 #if defined(OS_ANDROID)
   // Reset the time stamp so that the metrics are not reported if this entry is
   // loaded again in the future.
@@ -688,6 +685,7 @@ void NavigationEntryImpl::AddOrUpdateFrameEntry(
     FrameTreeNode* frame_tree_node,
     int64_t item_sequence_number,
     int64_t document_sequence_number,
+    SiteInstanceImpl* source_site_instance,
     SiteInstanceImpl* site_instance,
     const GURL& url,
     const Referrer& referrer,
@@ -710,9 +708,10 @@ void NavigationEntryImpl::AddOrUpdateFrameEntry(
   for (TreeNode* child : parent_node->children) {
     if (child->frame_entry->frame_unique_name() == unique_name) {
       // Update the existing FrameNavigationEntry (e.g., for replaceState).
-      child->frame_entry->UpdateEntry(
-          unique_name, item_sequence_number, document_sequence_number,
-          site_instance, url, referrer, page_state, method, post_id);
+      child->frame_entry->UpdateEntry(unique_name, item_sequence_number,
+                                      document_sequence_number,
+                                      source_site_instance, site_instance, url,
+                                      referrer, page_state, method, post_id);
       return;
     }
   }
@@ -724,6 +723,7 @@ void NavigationEntryImpl::AddOrUpdateFrameEntry(
       unique_name, item_sequence_number, document_sequence_number,
       site_instance, url, referrer, method, post_id);
   frame_entry->set_page_state(page_state);
+  frame_entry->set_source_site_instance(source_site_instance);

[Charlie Reis, 2016/05/04 23:03:01]

I think we probably want to put this in the FrameNavigationEntry constructor if
possible, so that we don't forget to call this in random cases.

[nasko, 2016/05/05 17:51:33]

Done.

   parent_node->children.push_back(
       new NavigationEntryImpl::TreeNode(frame_entry));
 }