Revert r15278. More unexpected test failures :(

TBR=mpcomplete

Review URL: http://codereview.chromium.org/108005

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

1 files changed, 10 insertions, 1 deletions

diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index a839cd8..65fca92 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -273,7 +273,7 @@ class RenderView : public RenderWidget,
   virtual void TakeFocus(WebView* webview, bool reverse);
   virtual void JSOutOfMemory();
 
-  virtual void NavigateBackForwardSoon(int offset);
+  virtual WebHistoryItem* GetHistoryEntryAtOffset(int offset);
   virtual int GetHistoryBackListCount();
   virtual int GetHistoryForwardListCount();
   virtual void OnNavStateChanged(WebView* webview);
@@ -449,6 +449,10 @@ class RenderView : public RenderWidget,
   // keyword search.
   void AddGURLSearchProvider(const GURL& osd_url, bool autodetected);
 
+  // Tells the browser process to navigate to a back/forward entry at the given
+  // offset from current.
+  void GoToEntryAtOffset(int offset);
+
   // RenderView IPC message handlers
   void SendThumbnail();
   void OnPrintPages();
@@ -751,6 +755,11 @@ class RenderView : public RenderWidget,
   // out of date responses.
   int form_field_autofill_request_id_;
 
+  // A cached WebHistoryItem used for back/forward navigations initiated by
+  // WebCore (via the window.history.go API).  We only have one such navigation
+  // pending at a time.
+  scoped_refptr<WebHistoryItem> history_navigation_item_;
+
   // We need to prevent windows from closing themselves with a window.close()
   // call while a blocked popup notification is being displayed. We cannot
   // synchronously querry the Browser process. We cannot wait for the Browser