PlzNavigate: change behavior when navigating with a non-live RFH

content/browser/frame_host/render_frame_host_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
 
 #include <list>
 
 #include "base/basictypes.h"
@@ skipping 216 matching lines @@
 
   // Returns the current committed Web UI or NULL if none applies.
   WebUIImpl* web_ui() const { return web_ui_.get(); }
 
   // Returns the Web UI for the pending navigation, or NULL of none applies.
   WebUIImpl* pending_web_ui() const {
     return pending_web_ui_.get() ? pending_web_ui_.get() :
                                    pending_and_current_web_ui_.get();
   }
 
+  // PlzNavigate
+  // Returns the speculative Web UI for the navigation, or nullptr of none
+  // applies.
+  WebUIImpl* speculative_web_ui() const {

[nasko, 2015/02/02 21:20:40]

nit: Since this is used only in tests, let's add a suffix to indicate it.

[carlosk, 2015/02/03 10:06:26]

Done.

+    return should_reuse_web_ui_ ? web_ui_.get() : speculative_web_ui_.get();

[nasko, 2015/02/02 21:20:40]

Should the regular web_ui_ be returned in a method asking for the speculative?

[carlosk, 2015/02/03 10:06:26]

Yes when |should_reuse_web_ui_| is true. It is the exact equivalent of how
|pending_web_ui()| just above works. The difference from the speculative
implementation to the pending one is that when the former has to reuse the
current WebUI it sets this boolean to true, while the latter makes a weak
pointer copy of it into |pending_and_current_web_ui_|.

[clamy, 2015/02/03 10:59:11]

Maybe you could precise this in the comment?

[carlosk, 2015/02/04 11:03:25]

Done.

+  }
+
   // Called when we want to instruct the renderer to navigate to the given
   // navigation entry. It may create a new RenderFrameHost or re-use an existing
   // one. The RenderFrameHost to navigate will be returned. Returns NULL if one
   // could not be created.
   RenderFrameHostImpl* Navigate(const NavigationEntryImpl& entry);
 
   // Instructs the various live views to stop. Called when the user directed the
   // page to stop loading.
   void Stop();
 
@@ skipping 426 matching lines @@
   bool should_reuse_web_ui_;
 
   base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_