2 files changed, 6 insertions, 14 deletions
diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h
index b4952b1..5fcd4cd 100644
--- a/WebCore/loader/EmptyClients.h
+++ b/WebCore/loader/EmptyClients.h
@@ -283,11 +283,9 @@ public:
     virtual void updateGlobalHistory() { }
     virtual void updateGlobalHistoryRedirectLinks() { }
     virtual bool shouldGoToHistoryItem(HistoryItem*) const { return false; }
-#ifdef ANDROID_HISTORY_CLIENT
-    virtual void dispatchDidAddHistoryItem(HistoryItem*) const {}
-    virtual void dispatchDidRemoveHistoryItem(HistoryItem*, int) const {}
-    virtual void dispatchDidChangeHistoryIndex(BackForwardList*) const {}
-#endif
+    virtual void dispatchDidAddBackForwardItem(HistoryItem*) const  { }
+    virtual void dispatchDidRemoveBackForwardItem(HistoryItem*) const { }
+    virtual void dispatchDidChangeBackForwardIndex() const { }
     virtual void saveViewStateToItem(HistoryItem*) { }
     virtual bool canCachePage() const { return false; }
     virtual void didDisplayInsecureContent() { }
diff --git a/WebCore/loader/FrameLoaderClient.h b/WebCore/loader/FrameLoaderClient.h
index a20bd43..7d988f1 100644
--- a/WebCore/loader/FrameLoaderClient.h
+++ b/WebCore/loader/FrameLoaderClient.h
@@ -73,10 +73,6 @@ namespace WebCore {
     class String;
     class Widget;
 
-#ifdef ANDROID_HISTORY_CLIENT
-    class BackForwardList;
-#endif
-
     typedef void (PolicyChecker::*FramePolicyFunction)(PolicyAction);
 
     class FrameLoaderClient {
@@ -169,11 +165,9 @@ namespace WebCore {
         virtual void updateGlobalHistoryRedirectLinks() = 0;
 
         virtual bool shouldGoToHistoryItem(HistoryItem*) const = 0;
-#ifdef ANDROID_HISTORY_CLIENT
-        virtual void dispatchDidAddHistoryItem(HistoryItem*) const = 0;
-        virtual void dispatchDidRemoveHistoryItem(HistoryItem*, int) const = 0;
-        virtual void dispatchDidChangeHistoryIndex(BackForwardList*) const = 0;
-#endif
+        virtual void dispatchDidAddBackForwardItem(HistoryItem*) const = 0;
+        virtual void dispatchDidRemoveBackForwardItem(HistoryItem*) const = 0;
+        virtual void dispatchDidChangeBackForwardIndex() const = 0;
 
         // This frame has displayed inactive content (such as an image) from an
         // insecure source.  Inactive content cannot spread to other frames.