PlzNavigate: Support data urls

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index e6cc05197d3a25613468d2938787f3f54da90757..697b31c7588de0aa17b0abacaa948297f9c191d3 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -1471,11 +1471,11 @@ void RenderFrameHostImpl::Navigate(const FrameMsg_Navigate_Params& params) {
     ChildProcessSecurityPolicyImpl::GetInstance()->GrantRequestURL(
         GetProcess()->GetID(), params.common_params.url);
     if (params.common_params.url.SchemeIs(url::kDataScheme) &&
-        params.base_url_for_data_url.SchemeIs(url::kFileScheme)) {
+        params.common_params.base_url_for_data_url.SchemeIs(url::kFileScheme)) {
       // If 'data:' is used, and we have a 'file:' base url, grant access to
       // local files.
       ChildProcessSecurityPolicyImpl::GetInstance()->GrantRequestURL(
-          GetProcess()->GetID(), params.base_url_for_data_url);
+          GetProcess()->GetID(), params.common_params.base_url_for_data_url);
     }
   }
 
@@ -1642,6 +1642,8 @@ void RenderFrameHostImpl::CommitNavigation(
     scoped_ptr<StreamHandle> body,
     const CommonNavigationParams& common_params,
     const CommitNavigationParams& commit_params) {
+  DCHECK((response && body.get()) ||
+          !ShouldMakeNetworkRequestForNavigation(common_params.url));
   // TODO(clamy): Check if we have to add security checks for the browser plugin
   // guests.
 
@@ -1649,9 +1651,11 @@ void RenderFrameHostImpl::CommitNavigation(
   // completing a RFH swap or unload handler.
   SetState(RenderFrameHostImpl::STATE_DEFAULT);
 
+  const GURL body_url = body.get() ? body->GetURL() : GURL();
+  const ResourceResponseHead head = response ?
+      response->head : ResourceResponseHead();
   Send(new FrameMsg_CommitNavigation(
-      routing_id_, response->head, body->GetURL(),
-      common_params, commit_params));
+      routing_id_, head, body_url, common_params, commit_params));
   // TODO(clamy): Check if we should start the throbber for non javascript urls
   // here.