PlzNavigate: Add tests to check WebUI navigations.

content/browser/frame_host/render_frame_host_manager.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/render_frame_host_manager.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 982 matching lines @@
   // if needed when it no longer breaks OAuth popups (see
   // https://crbug.com/440266).
   bool is_main_frame = frame_tree_node_->IsMainFrame();
   if (current_site_instance == dest_site_instance.get() ||
       (!request.browser_initiated() && is_main_frame) ||
       (!is_main_frame && !dest_site_instance->RequiresDedicatedProcess() &&
        !current_site_instance->RequiresDedicatedProcess())) {
     // Reuse the current RFH if its SiteInstance matches the the navigation's
     // or if this is a subframe navigation. We only swap RFHs for subframes when
     // --site-per-process is enabled.
-    CleanUpNavigation();
+
+    // There might be a pending WebUI in the current RenderFrameHost from a
+    // previous call of this function in the same navigation and it should be
+    // maintained for the next call to UpdatePendingWebUI. So instead of calling

[clamy, 2015/10/22 16:51:39]

nit: RenderFrameHostImpl::UpdatePendingWebUI.

[carlosk, 2015/10/26 10:33:23]

Done.

+    // CleanUpNavigation, only the speculative RenderFrameHost is discarded.

[clamy, 2015/10/22 16:51:39]

nit: s/the speculative RenderFrameHost is discarded/discard the speculative
RenderFrameHost

[carlosk, 2015/10/26 10:33:23]

Done.

+    if (speculative_render_frame_host_)
+      DiscardUnusedFrame(UnsetSpeculativeRenderFrameHost());
+
     navigation_rfh = render_frame_host_.get();
 
     // As SiteInstances are the same, make the RFH update its possible pending
     // WebUI.
     render_frame_host_->UpdatePendingWebUI(request.common_params().url,
                                            request.bindings());
     DCHECK(speculative_web_ui() == render_frame_host_->pending_web_ui());
 
     // If a pending WebUI was set on the current RenderFrameHost (be it a new
     // one or the reused current one) and the associated RenderFrame is alive,
@@ skipping 71 matching lines @@
     }
   }
 
   return navigation_rfh;
 }
 
 // PlzNavigate
 void RenderFrameHostManager::CleanUpNavigation() {
   CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation));
-  // TODO(carlosk): the discarding of the current RFH WebUI and the cleanup of
-  // the speculative RFH should not always happen together.
   render_frame_host_->DiscardPendingWebUI();
   if (speculative_render_frame_host_)
     DiscardUnusedFrame(UnsetSpeculativeRenderFrameHost());
 }
 
 // PlzNavigate
 scoped_ptr<RenderFrameHostImpl>
 RenderFrameHostManager::UnsetSpeculativeRenderFrameHost() {
   CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation));
@@ skipping 1470 matching lines @@
 int RenderFrameHostManager::GetOpenerRoutingID(SiteInstance* instance) {
   if (!frame_tree_node_->opener())
     return MSG_ROUTING_NONE;
 
   return frame_tree_node_->opener()
       ->render_manager()
       ->GetRoutingIdForSiteInstance(instance);
 }
 
 }  // namespace content