Solidify Entry discarding logic (NavigationHandle keeps its ID)

content/renderer/render_frame_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/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 3061 matching lines @@
   }
 
   base::TimeTicks navigation_start =
       navigation_state->common_params().navigation_start;
   DCHECK(!navigation_start.is_null());
 
   FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
                     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(
     blink::WebLocalFrame* frame) {
   DCHECK_EQ(frame_, frame);
 
   // We don't use HistoryController in OOPIF enabled modes.
   if (SiteIsolationPolicy::UseSubframeNavigationEntries())
     return;
 
@@ skipping 3032 matching lines @@
                                     int match_count,
                                     int ordinal,
                                     const WebRect& selection_rect,
                                     bool final_status_update) {
   Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
                                    selection_rect, ordinal,
                                    final_status_update));
 }
 
 }  // namespace content