Move ownership of source SiteInstance to the FrameNavigationEntry.

content/browser/frame_host/navigation_entry_impl.h

Index: content/browser/frame_host/navigation_entry_impl.h
diff --git a/content/browser/frame_host/navigation_entry_impl.h b/content/browser/frame_host/navigation_entry_impl.h
index 2e40e67098d6bce721bb60f9a96acc6fbe1c370c..16f43d142e0f9cb36e1ed764809f3f1bea731e4f 100644
--- a/content/browser/frame_host/navigation_entry_impl.h
+++ b/content/browser/frame_host/navigation_entry_impl.h
@@ -177,7 +177,7 @@ class CONTENT_EXPORT NavigationEntryImpl
 
   // Once a navigation entry is committed, we should no longer track several
   // pieces of non-persisted state, as documented on the members below.

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

Mention what |frame_entry| is, and that it can be null.

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

Done.

-  void ResetForCommit();
+  void ResetForCommit(FrameNavigationEntry* frame_entry);
 
   // Exposes the tree of FrameNavigationEntries that make up this joint session
   // history item.
@@ -197,6 +197,7 @@ class CONTENT_EXPORT NavigationEntryImpl
   void AddOrUpdateFrameEntry(FrameTreeNode* frame_tree_node,
                              int64_t item_sequence_number,
                              int64_t document_sequence_number,
+                             SiteInstanceImpl* source_site_instance,

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

As in FNE, let's list site_instance before source_site_instance.

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

Done.

                              SiteInstanceImpl* site_instance,
                              const GURL& url,
                              const Referrer& referrer,
@@ -223,13 +224,6 @@ class CONTENT_EXPORT NavigationEntryImpl
     return frame_tree_->frame_entry->site_instance();
   }
 
-  // The |source_site_instance| is used to identify the SiteInstance of the
-  // frame that initiated the navigation.
-  void set_source_site_instance(SiteInstanceImpl* source_site_instance);
-  SiteInstanceImpl* source_site_instance() const {
-    return source_site_instance_.get();
-  }
-
   // Remember the set of bindings granted to this NavigationEntry at the time
   // of commit, to ensure that we do not grant it additional bindings if we
   // navigate back to it in the future.  This can only be changed once.
@@ -418,9 +412,6 @@ class CONTENT_EXPORT NavigationEntryImpl
   // This member is not persisted with session restore.
   std::string extra_headers_;
 
-  // This member is cleared in |ResetForCommit| and not persisted.
-  scoped_refptr<SiteInstanceImpl> source_site_instance_;
-
   // Used for specifying base URL for pages loaded via data URLs. Only used and
   // persisted by Android WebView.
   GURL base_url_for_data_url_;