De-virtualize RenderViewImpl's commit-time functions

didNavigateWithinPage() is only used by RenderViewTest, which can call directly into RenderFrameImpl::didNavigateWithinPage() to accomplish the same thing.

didCommitProvisionaLoad() should be FrameDidCommitProvisionaLoad() and devirtualized.

This is necessary to allow builds that use -Woverloaded-virtual to successfully compile the next step of moving HistoryController to content/ (https://codereview.chromium.org/217363005/)

BUG=357327

Review URL: https://codereview.chromium.org/224713002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261898 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 11 insertions, 20 deletions

diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
index e01965f..782e16f 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -360,7 +360,11 @@ bool RenderViewTest::OnMessageReceived(const IPC::Message& msg) {
 void RenderViewTest::DidNavigateWithinPage(blink::WebLocalFrame* frame,
                                            bool is_new_navigation) {
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
-  impl->didNavigateWithinPage(frame, is_new_navigation);
+  impl->main_render_frame()->didNavigateWithinPage(
+      frame,
+      blink::WebHistoryItem(),
+      is_new_navigation ? blink::WebStandardCommit
+                        : blink::WebHistoryInertCommit);
 }
 
 void RenderViewTest::SendContentStateImmediately() {
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index b18c551..8160ee3 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1805,7 +1805,7 @@ void RenderFrameImpl::didCommitProvisionalLoad(blink::WebLocalFrame* frame,
     }
   }
 
-  render_view_->didCommitProvisionalLoad(frame, is_new_navigation);
+  render_view_->FrameDidCommitProvisionalLoad(frame, is_new_navigation);
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_,
                     DidCommitProvisionalLoad(is_new_navigation));
 
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 26d6b53..666772c 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2463,8 +2463,8 @@ void RenderViewImpl::didFailProvisionalLoad(WebLocalFrame* frame,
       RenderViewObserver, observers_, DidFailProvisionalLoad(frame, error));
 }
 
-void RenderViewImpl::didCommitProvisionalLoad(WebLocalFrame* frame,
-                                              bool is_new_navigation) {
+void RenderViewImpl::FrameDidCommitProvisionalLoad(WebFrame* frame,
+                                                   bool is_new_navigation) {
   FOR_EACH_OBSERVER(RenderViewObserver, observers_,
                     DidCommitProvisionalLoad(frame, is_new_navigation));
 
@@ -2557,13 +2557,6 @@ void RenderViewImpl::didFinishLoad(WebLocalFrame* frame) {
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidFinishLoad(frame));
 }
 
-void RenderViewImpl::didNavigateWithinPage(WebLocalFrame* frame,
-                                           bool is_new_navigation) {
-  // TODO(nasko): Forward calls to the main RenderFrameImpl until all
-  // callers of this method on RenderView are removed.
-  main_render_frame_->didNavigateWithinPage(frame, is_new_navigation);
-}
-
 void RenderViewImpl::didUpdateCurrentHistoryItem(WebLocalFrame* frame) {
   StartNavStateSyncTimerIfNecessary();
 }
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index b11af11..e08d17d 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -285,6 +285,8 @@ class CONTENT_EXPORT RenderViewImpl
 
   void FrameDidChangeLoadProgress(blink::WebFrame* frame,
                                   double load_progress);
+  void FrameDidCommitProvisionalLoad(blink::WebFrame* frame,
+                                     bool is_new_navigation);
 
   // Plugin-related functions --------------------------------------------------
 
@@ -539,8 +541,6 @@ class CONTENT_EXPORT RenderViewImpl
   virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame);
   virtual void didFailProvisionalLoad(blink::WebLocalFrame* frame,
                                       const blink::WebURLError& error);
-  virtual void didCommitProvisionalLoad(blink::WebLocalFrame* frame,
-                                        bool is_new_navigation);
   virtual void didClearWindowObject(blink::WebLocalFrame* frame, int world_id);
   virtual void didCreateDocumentElement(blink::WebLocalFrame* frame);
   virtual void didReceiveTitle(blink::WebLocalFrame* frame,
@@ -552,8 +552,6 @@ class CONTENT_EXPORT RenderViewImpl
   virtual void didFailLoad(blink::WebLocalFrame* frame,
                            const blink::WebURLError& error);
   virtual void didFinishLoad(blink::WebLocalFrame* frame);
-  virtual void didNavigateWithinPage(blink::WebLocalFrame* frame,
-                                     bool is_new_navigation);
   virtual void didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame);
   virtual void willSendRequest(blink::WebLocalFrame* frame,
                                unsigned identifier,
diff --git a/content/shell/renderer/test_runner/WebFrameTestProxy.h b/content/shell/renderer/test_runner/WebFrameTestProxy.h
index 7756e9f..d6eb7e5 100644
--- a/content/shell/renderer/test_runner/WebFrameTestProxy.h
+++ b/content/shell/renderer/test_runner/WebFrameTestProxy.h
@@ -71,6 +71,7 @@ public:
     }
     virtual void didCommitProvisionalLoad(blink::WebLocalFrame* frame, bool isNewNavigation)
     {
+        m_baseProxy->didCommitProvisionalLoad(frame, isNewNavigation);
         Base::didCommitProvisionalLoad(frame, isNewNavigation);
     }
     virtual void didReceiveTitle(blink::WebLocalFrame* frame, const blink::WebString& title, blink::WebTextDirection direction)
diff --git a/content/shell/renderer/test_runner/WebTestProxy.h b/content/shell/renderer/test_runner/WebTestProxy.h
index f2ed7f1..643f57f 100644
--- a/content/shell/renderer/test_runner/WebTestProxy.h
+++ b/content/shell/renderer/test_runner/WebTestProxy.h
@@ -379,11 +379,6 @@ public:
             return;
         Base::didFailProvisionalLoad(frame, error);
     }
-    virtual void didCommitProvisionalLoad(blink::WebLocalFrame* frame, bool isNewNavigation)
-    {
-        WebTestProxyBase::didCommitProvisionalLoad(frame, isNewNavigation);
-        Base::didCommitProvisionalLoad(frame, isNewNavigation);
-    }
     virtual void didReceiveTitle(blink::WebLocalFrame* frame, const blink::WebString& title, blink::WebTextDirection direction)
     {
         WebTestProxyBase::didReceiveTitle(frame, title, direction);