Solidify Entry discarding logic (NavigationHandle keeps its ID)

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 95d61fa50e0b1d38425464e7c9af0ba3f0425420..d57fbe8b4765253899d868646f0039ad9279c852 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -3079,8 +3079,13 @@ void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame,
                     DidStartProvisionalLoad(frame));
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidStartProvisionalLoad());
 
-  Send(new FrameHostMsg_DidStartProvisionalLoad(
-      routing_id_, ds->request().url(), navigation_start));
+  // Don't use MaybeGetOverriddenURL here because error pages need to send the
+  // overridden url.
+  GURL url(ds->request().url());

[Charlie Harrison, 2016/02/16 20:54:46]

This snippet solves the base url / data url problem with us creating 2
NavigationHandles. If all tests pass, I assume no one is relying on us sending
the other url.

[Charlie Reis, 2016/02/16 21:55:07]

This is largely a question for boliu@, since it might impact apps that use
Android Webview.  I'm not sure if they have expectations about which URL shows
up in DidStartProvisionalLoad.

(Also, please add a comment about the LoadDataWithBaseURL case, since it's not
obvious why this is needed from looking at the code.)

[Charlie Harrison, 2016/02/16 22:55:23]

Done.

+  if (document_state->was_load_data_with_base_url_request())
+    url = document_state->data_url();
+  Send(new FrameHostMsg_DidStartProvisionalLoad(routing_id_, url,
+                                                navigation_start));
 }
 
 void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad(