From db7fa48a66c1912a7f44a1624c3d42aaf5ba7970 Mon Sep 17 00:00:00 2001
From: Benjamin Smedberg <benjamin@smedbergs.us>
Date: Fri, 25 Mar 2011 11:03:34 -0400
Subject: [PATCH] Bug 617539 - Fold in nsIDocShell_MOZILLA_2_0_BRANCH, r=bz

---
 docshell/base/nsDocShell.cpp  | 1 -
 docshell/base/nsDocShell.h    | 4 +---
 docshell/base/nsIDocShell.idl | 5 +----
 dom/base/nsGlobalWindow.cpp   | 3 +--
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 7c57ad0e33a..a18ecf82b34 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -864,7 +864,6 @@ NS_INTERFACE_MAP_BEGIN(nsDocShell)
     NS_INTERFACE_MAP_ENTRY(nsIWebShellServices)
     NS_INTERFACE_MAP_ENTRY(nsILinkHandler)
     NS_INTERFACE_MAP_ENTRY(nsIClipboardCommands)
-    NS_INTERFACE_MAP_ENTRY(nsIDocShell_MOZILLA_2_0_BRANCH)
 NS_INTERFACE_MAP_END_INHERITING(nsDocLoader)
 
 ///*****************************************************************************
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index 703f6cbdc4c..ccea93cea38 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -186,8 +186,7 @@ class nsDocShell : public nsDocLoader,
                    public nsILoadContext,
                    public nsIWebShellServices,
                    public nsILinkHandler,
-                   public nsIClipboardCommands,
-                   public nsIDocShell_MOZILLA_2_0_BRANCH
+                   public nsIClipboardCommands
 {
     friend class nsDSURIContentListener;
 
@@ -202,7 +201,6 @@ public:
     NS_DECL_ISUPPORTS_INHERITED
 
     NS_DECL_NSIDOCSHELL
-    NS_DECL_NSIDOCSHELL_MOZILLA_2_0_BRANCH
     NS_DECL_NSIDOCSHELLTREEITEM
     NS_DECL_NSIDOCSHELLTREENODE
     NS_DECL_NSIDOCSHELLHISTORY
diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl
index e5a72e5813e..80fe492160e 100644
--- a/docshell/base/nsIDocShell.idl
+++ b/docshell/base/nsIDocShell.idl
@@ -71,7 +71,7 @@ interface nsIPrincipal;
 interface nsIWebBrowserPrint;
 interface nsIVariant;
 
-[scriptable, uuid(98cdbcc4-2d81-4191-a63f-b6c52085edbc)]
+[scriptable, uuid(1917a6d6-31f6-4033-868d-f15ca08ca2df)]
 interface nsIDocShell : nsISupports
 {
   /**
@@ -540,10 +540,7 @@ interface nsIDocShell : nsISupports
    * handling link clicks. Docshells are not app tabs unless told otherwise.
    */
   attribute boolean isAppTab;
-};
 
-[uuid(5f7a2184-31b6-4d67-9c75-0c17477766e2)]
-interface nsIDocShell_MOZILLA_2_0_BRANCH : nsISupports {
   /**
    * Create a new about:blank document and content viewer.
    * @param aPrincipal the principal to use for the new document.
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 88d0e5b042e..d92f3afb6fa 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -1609,8 +1609,7 @@ nsGlobalWindow::SetOpenerScriptPrincipal(nsIPrincipal* aPrincipal)
                  "Unexpected original document");
 #endif
 
-    nsCOMPtr<nsIDocShell_MOZILLA_2_0_BRANCH> ds(do_QueryInterface(GetDocShell()));
-    ds->CreateAboutBlankContentViewer(aPrincipal);
+    GetDocShell()->CreateAboutBlankContentViewer(aPrincipal);
     mDoc->SetIsInitialDocument(PR_TRUE);
 
     nsCOMPtr<nsIPresShell> shell;