Move ownership of source SiteInstance to the FrameNavigationEntry.

content/browser/frame_host/navigator_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/navigator_impl.h"
 
 #include <utility>
 
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
@@ skipping 755 matching lines @@
       // with a subframe entry for our destination.
       // TODO(creis): Ensure this case can't exist in https://crbug.com/524208.
       entry = NavigationEntryImpl::FromNavigationEntry(
           controller_->CreateNavigationEntry(
               GURL(url::kAboutBlankURL), referrer_to_use, page_transition,
               is_renderer_initiated, std::string(),
               controller_->GetBrowserContext()));
     }
     // TODO(creis): Handle POST submissions.  See https://crbug.com/582211 and
     // https://crbug.com/101395.
-    entry->AddOrUpdateFrameEntry(node, -1, -1, nullptr, dest_url,
-                                 referrer_to_use, PageState(), "GET", -1);
+    entry->AddOrUpdateFrameEntry(
+        node, -1, -1, nullptr,
+        static_cast<SiteInstanceImpl*>(source_site_instance), dest_url,
+        referrer_to_use, PageState(), "GET", -1);
   } else {
     // Main frame case.
     entry = NavigationEntryImpl::FromNavigationEntry(
         controller_->CreateNavigationEntry(
             dest_url, referrer_to_use, page_transition, is_renderer_initiated,
             std::string(), controller_->GetBrowserContext()));
+    entry->root_node()->frame_entry->set_source_site_instance(
+        static_cast<SiteInstanceImpl*>(source_site_instance));
   }
 
-  // The source_site_instance may matter for navigations via RenderFrameProxy.
-  entry->set_source_site_instance(
-      static_cast<SiteInstanceImpl*>(source_site_instance));
   entry->SetRedirectChain(redirect_chain);
   // Don't allow an entry replacement if there is no entry to replace.
   // http://crbug.com/457149
   if (should_replace_current_entry && controller_->GetEntryCount() > 0)
     entry->set_should_replace_entry(true);
   if (controller_->GetLastCommittedEntry() &&
       controller_->GetLastCommittedEntry()->GetIsOverridingUserAgent()) {
     entry->SetIsOverridingUserAgent(true);
   }
   entry->set_transferred_global_request_id(transferred_global_request_id);
   // TODO(creis): Set user gesture and intent received timestamp on Android.
 
   // We may not have successfully added the FrameNavigationEntry to |entry|
   // above (per https://crbug.com/608402), in which case we create it from
   // scratch.  This works because we do not depend on |frame_entry| being inside
   // |entry| during NavigateToEntry.  This will go away when we shortcut this
   // further in https://crbug.com/536906.
   scoped_refptr<FrameNavigationEntry> frame_entry(entry->GetFrameEntry(node));
   if (!frame_entry) {
     // TODO(creis): Handle POST submissions here, as above.
-    frame_entry =
-        new FrameNavigationEntry(node->unique_name(), -1, -1, nullptr, dest_url,
-                                 referrer_to_use, "GET", -1);
+    frame_entry = new FrameNavigationEntry(
+        node->unique_name(), -1, -1, nullptr,
+        static_cast<SiteInstanceImpl*>(source_site_instance), dest_url,
+        referrer_to_use, "GET", -1);
   }
   NavigateToEntry(node, *frame_entry, *entry.get(),
                   NavigationController::NO_RELOAD, false, false);
 }
 
 // PlzNavigate
 void NavigatorImpl::OnBeforeUnloadACK(FrameTreeNode* frame_tree_node,
                                       bool proceed) {
   CHECK(IsBrowserSideNavigationEnabled());
   DCHECK(frame_tree_node);
@@ skipping 323 matching lines @@
   if (pending_entry != controller_->GetVisibleEntry() ||
       !should_preserve_entry) {
     controller_->DiscardPendingEntry(true);
 
     // Also force the UI to refresh.
     controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL);
   }
 }
 
 }  // namespace content