Move ownership of source SiteInstance to the FrameNavigationEntry.

content/browser/frame_host/navigation_entry_impl.cc

 // Copyright 2013 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/navigation_entry_impl.h"
 
 #include <stddef.h>
 
 #include <queue>
 #include <utility>
@@ skipping 315 matching lines @@
 int32_t NavigationEntryImpl::GetPageID() const {
   return page_id_;
 }
 
 void NavigationEntryImpl::set_site_instance(
     scoped_refptr<SiteInstanceImpl> site_instance) {
   // TODO(creis): Update all callers and remove this method.
   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);
   CHECK(bindings_ == kInvalidBindings || bindings_ == bindings);
   bindings_ = bindings;
 }
 
 const base::string16& NavigationEntryImpl::GetTitleForDisplay() const {
   // Most pages have real titles. Don't even bother caching anything if this is
   // the case.
@@ skipping 305 matching lines @@
     GURL data_url(std::string(
         GetDataURLAsString()->front_as<char>(),
         std::min(GetDataURLAsString()->size(), kDataUriPrefixMaxLen)));
     if (data_url.is_valid() && data_url.SchemeIs(url::kDataScheme))
       request_params.data_url_as_string = GetDataURLAsString()->data();
   }
 #endif
   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);
 
   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.
   set_intent_received_timestamp(base::TimeTicks());
 #endif
 }
 
 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,
     const PageState& page_state,
     const std::string& method,
     int64_t post_id) {
   // We should already have a TreeNode for the parent node by the time this node
   // commits.  Find it first.
   DCHECK(frame_tree_node->parent());
   NavigationEntryImpl::TreeNode* parent_node =
       FindFrameEntry(frame_tree_node->parent());
   if (!parent_node) {
     // The renderer should not send a commit for a subframe before its parent.
     // TODO(creis): Kill the renderer if we get here.
     return;
   }
 
   // Now check whether we have a TreeNode for the node itself.
   const std::string& unique_name = frame_tree_node->unique_name();
   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;
     }
   }
 
   // No entry exists yet, so create a new one.
   // Unordered list, since we expect to look up entries by frame sequence number
   // or unique name.
   FrameNavigationEntry* frame_entry = new FrameNavigationEntry(
       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));
 }
 
 FrameNavigationEntry* NavigationEntryImpl::GetFrameEntry(
     FrameTreeNode* frame_tree_node) const {
   NavigationEntryImpl::TreeNode* tree_node = FindFrameEntry(frame_tree_node);
   return tree_node ? tree_node->frame_entry.get() : nullptr;
 }
 
@@ skipping 20 matching lines @@
       return node;
 
     // Enqueue any children and keep looking.
     for (auto& child : node->children)
       work_queue.push(child);
   }
   return nullptr;
 }
 
 }  // namespace content