Backing out changes for 80203 and 89626 to fix blocker 92325 and probably also blocker 92443.

git-svn-id: svn://10.0.0.236/trunk@99950 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/docshell/base/nsDocShell.cpp

@@ -2451,7 +2451,6 @@ nsDocShell::Destroy()
         docShellParentAsNode->RemoveChild(this);
 
     if (mContentViewer) {
-        mContentViewer->Close();
         mContentViewer->Destroy();
         mContentViewer = nsnull;
     }
@@ -4107,7 +4106,7 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
             }
         }
 
-        mContentViewer->Close();
+        mContentViewer->Destroy();
         aNewViewer->SetPreviousViewer(mContentViewer);
         mContentViewer = nsnull;
     }