From 79970c2a33d77c6f48e9b0968f72f9cee6dea59c Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Sat, 18 Jun 2011 11:03:17 +0200
Subject: [PATCH] Bug 664979 - Merge nsISHistory_2_0_BRANCH into nsISHistory;
 r=bz

---
 browser/components/sessionstore/src/nsSessionStore.js | 2 +-
 docshell/shistory/public/nsISHistory.idl              | 8 ++------
 docshell/shistory/src/nsSHistory.cpp                  | 1 -
 docshell/shistory/src/nsSHistory.h                    | 3 +--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/browser/components/sessionstore/src/nsSessionStore.js b/browser/components/sessionstore/src/nsSessionStore.js
index 3206158062cd..d2b5f4cec8a5 100644
--- a/browser/components/sessionstore/src/nsSessionStore.js
+++ b/browser/components/sessionstore/src/nsSessionStore.js
@@ -2904,7 +2904,7 @@ SessionStoreService.prototype = {
         // instead of gotoIndex. See bug 597315.
         browser.webNavigation.sessionHistory.getEntryAtIndex(activeIndex, true);
         browser.webNavigation.sessionHistory.
-          QueryInterface(Ci.nsISHistory_2_0_BRANCH).reloadCurrentEntry();
+          QueryInterface(Ci.nsISHistory).reloadCurrentEntry();
       }
       catch (ex) {
         // ignore page load errors
diff --git a/docshell/shistory/public/nsISHistory.idl b/docshell/shistory/public/nsISHistory.idl
index c93aeaf40118..f75398c5dbe4 100644
--- a/docshell/shistory/public/nsISHistory.idl
+++ b/docshell/shistory/public/nsISHistory.idl
@@ -60,7 +60,7 @@ interface nsISimpleEnumerator;
 #define NS_SHISTORY_CONTRACTID "@mozilla.org/browser/shistory;1"
 %}
 
-[scriptable, uuid(9883609F-CDD8-4d83-9B55-868FF08AD433)]
+[scriptable, uuid(ef2c9bcb-96b8-4095-933a-cb1c506f2c58)]
 interface nsISHistory: nsISupports
 {
   /**
@@ -177,10 +177,6 @@ interface nsISHistory: nsISupports
    * @see do_QueryInterface()
    */
    readonly attribute nsISimpleEnumerator SHistoryEnumerator;
-};
 
-[scriptable, uuid(ac8b3eb3-2051-4cce-8303-d6e7938501dd)]
-interface nsISHistory_2_0_BRANCH: nsISHistory
-{
-  void reloadCurrentEntry();
+   void reloadCurrentEntry();
 };
diff --git a/docshell/shistory/src/nsSHistory.cpp b/docshell/shistory/src/nsSHistory.cpp
index 6ca93e28a8fe..16bcb5db1ff0 100644
--- a/docshell/shistory/src/nsSHistory.cpp
+++ b/docshell/shistory/src/nsSHistory.cpp
@@ -164,7 +164,6 @@ NS_INTERFACE_MAP_BEGIN(nsSHistory)
    NS_INTERFACE_MAP_ENTRY(nsISHistory)
    NS_INTERFACE_MAP_ENTRY(nsIWebNavigation)
    NS_INTERFACE_MAP_ENTRY(nsISHistoryInternal)
-   NS_INTERFACE_MAP_ENTRY(nsISHistory_2_0_BRANCH)
 NS_INTERFACE_MAP_END
 
 //*****************************************************************************
diff --git a/docshell/shistory/src/nsSHistory.h b/docshell/shistory/src/nsSHistory.h
index f6b696a474c5..94a9650ef73d 100644
--- a/docshell/shistory/src/nsSHistory.h
+++ b/docshell/shistory/src/nsSHistory.h
@@ -62,7 +62,7 @@ class nsIDocShell;
 class nsSHEnumerator;
 class nsSHistoryObserver;
 class nsSHistory: public PRCList,
-                  public nsISHistory_2_0_BRANCH,
+                  public nsISHistory,
                   public nsISHistoryInternal,
                   public nsIWebNavigation
 {
@@ -73,7 +73,6 @@ public:
   NS_DECL_NSISHISTORY
   NS_DECL_NSISHISTORYINTERNAL
   NS_DECL_NSIWEBNAVIGATION
-  NS_DECL_NSISHISTORY_2_0_BRANCH
 
   // One time initialization method called upon docshell module construction
   static nsresult Startup();