PlzNavigate: unify OnCommitNavigation with OnNavigate in RenderFrameImpl

content/renderer/render_frame_impl.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_RENDERER_RENDER_FRAME_IMPL_H_
 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 94 matching lines @@
 class ScreenOrientationDispatcher;
 class UserMediaClientImpl;
 enum class SandboxFlags;
 struct CommonNavigationParams;
 struct CustomContextMenuContext;
 struct FrameReplicationState;
 struct NavigationParams;
 struct RequestNavigationParams;
 struct ResourceResponseHead;
 struct StartNavigationParams;
+struct StreamOverrideParameters;
 
 class CONTENT_EXPORT RenderFrameImpl
     : public RenderFrame,
       NON_EXPORTED_BASE(public blink::WebFrameClient),
       NON_EXPORTED_BASE(public media::WebMediaPlayerDelegate) {
  public:
   // Creates a new RenderFrame. |render_view| is the RenderView object that this
   // frame belongs to.
   // Callers *must* call |SetWebFrame| immediately after creation.
   // Note: This is called only when RenderFrame is created by Blink through
@@ skipping 534 matching lines @@
 
   // Virtual since overridden by WebTestProxy for layout tests.
   virtual blink::WebNavigationPolicy DecidePolicyForNavigation(
       RenderFrame* render_frame,
       const NavigationPolicyInfo& info);
   void OpenURL(blink::WebFrame* frame,
                const GURL& url,
                const Referrer& referrer,
                blink::WebNavigationPolicy policy);
 
+  // Performs a navigation in the frame. This provides a unified function for
+  // the current code path and the browser-side navigation path (in
+  // development). Currently used by OnNavigate, with all *NavigationParams
+  // provided by the browser. |stream_params| should be null.
+  // PlzNavigate: used by OnCommitNavigation, with |common_params| and
+  // |request_params| received by the browser. |stream_params| should be non
+  // null and created from the information provided by the browser.
+  // |start_params| is not used.
+  void NavigateInternal(const CommonNavigationParams& common_params,
+                        const StartNavigationParams& start_params,
+                        const RequestNavigationParams& request_params,
+                        scoped_ptr<StreamOverrideParameters> stream_params);
+
   // Update current main frame's encoding and send it to browser window.
   // Since we want to let users see the right encoding info from menu
   // before finishing loading, we call the UpdateEncoding in
   // a) function:DidCommitLoadForFrame. When this function is called,
   // that means we have got first data. In here we try to get encoding
   // of page if it has been specified in http header.
   // b) function:DidReceiveTitle. When this function is called,
   // that means we have got specified title. Because in most of webpages,
   // title tags will follow meta tags. In here we try to get encoding of
   // page if it has been specified in meta tag.
@@ skipping 253 matching lines @@
 #endif
 
   base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_