OOPIF: Data URLs are now rendered in the renderer that initiated the navigation.

chrome/browser/ui/browser_navigator.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/browser_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
@@ skipping 239 matching lines @@
   if (params->source_contents) {
     return Profile::FromBrowserContext(
         params->source_contents->GetBrowserContext());
   }
 
   return params->initiating_profile;
 }
 
 void LoadURLInContents(WebContents* target_contents,
                        const GURL& url,
+                       content::SiteInstance* site_instance,

[Charlie Reis, 2014/11/20 19:58:43]

Isn't this already in |params|?

[lfg, 2014/12/05 21:55:42]

Yep. Removed.

                        chrome::NavigateParams* params) {
   NavigationController::LoadURLParams load_url_params(url);
+  load_url_params.site_instance = site_instance;
   load_url_params.referrer = params->referrer;
   load_url_params.frame_tree_node_id = params->frame_tree_node_id;
   load_url_params.redirect_chain = params->redirect_chain;
   load_url_params.transition_type = params->transition;
   load_url_params.extra_headers = params->extra_headers;
   load_url_params.should_replace_current_entry =
       params->should_replace_current_entry;
 
   if (params->transferred_global_request_id != GlobalRequestID()) {
     load_url_params.is_renderer_initiated = params->is_renderer_initiated;
@@ skipping 206 matching lines @@
       host_desktop_type(chrome::GetActiveDesktop()),
       should_replace_current_entry(false),
       should_set_opener(false) {
 }
 
 NavigateParams::~NavigateParams() {}
 
 void FillNavigateParamsFromOpenURLParams(chrome::NavigateParams* nav_params,
                                          const content::OpenURLParams& params) {
   nav_params->referrer = params.referrer;
+  nav_params->site_instance = params.site_instance;
   nav_params->frame_tree_node_id = params.frame_tree_node_id;
   nav_params->redirect_chain = params.redirect_chain;
   nav_params->extra_headers = params.extra_headers;
   nav_params->disposition = params.disposition;
   nav_params->trusted_source = false;
   nav_params->is_renderer_initiated = params.is_renderer_initiated;
   nav_params->transferred_global_request_id =
       params.transferred_global_request_id;
   nav_params->should_replace_current_entry =
       params.should_replace_current_entry;
@@ skipping 136 matching lines @@
     if (user_initiated)
       params->target_contents->UserGestureDone();
 
     if (!swapped_in_prerender) {
       // Try to handle non-navigational URLs that popup dialogs and such, these
       // should not actually navigate.
       if (!HandleNonNavigationAboutURL(params->url)) {
         // Perform the actual navigation, tracking whether it came from the
         // renderer.
 
-        LoadURLInContents(params->target_contents, params->url, params);
+        LoadURLInContents(params->target_contents, params->url,
+                          params->site_instance.get(), params);
         // For prerender bookkeeping purposes, record that this pending navigate
         // originated from chrome::Navigate.
         content::NavigationEntry* entry =
             params->target_contents->GetController().GetPendingEntry();
         if (entry)
           entry->SetExtraData(prerender::kChromeNavigateExtraDataKey,
                               base::string16());
       }
     }
   } else {
@@ skipping 35 matching lines @@
   }
 
   if (singleton_index >= 0) {
     WebContents* target =
         params->browser->tab_strip_model()->GetWebContentsAt(singleton_index);
 
     if (target->IsCrashed()) {
       target->GetController().Reload(true);
     } else if (params->path_behavior == NavigateParams::IGNORE_AND_NAVIGATE &&
         target->GetURL() != params->url) {
-      LoadURLInContents(target, params->url, params);
+      LoadURLInContents(target, params->url, params->site_instance.get(),
+                        params);
       // For prerender bookkeeping purposes, record that this pending navigate
       // originated from chrome::Navigate.
       content::NavigationEntry* entry =
           target->GetController().GetPendingEntry();
       if (entry)
         entry->SetExtraData(prerender::kChromeNavigateExtraDataKey,
                             base::string16());
     }
 
     // If the singleton tab isn't already selected, select it.
@@ skipping 58 matching lines @@
   bool reverse_on_redirect = false;
   content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
       &rewritten_url, browser_context, &reverse_on_redirect);
 
   // Some URLs are mapped to uber subpages. Do not allow them in incognito.
   return !(rewritten_url.scheme() == content::kChromeUIScheme &&
            rewritten_url.host() == chrome::kChromeUIUberHost);
 }
 
 }  // namespace chrome