diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
index f08282564e7..91533619d29 100644
--- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
+++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
@@ -84,7 +84,10 @@
 
 // For Copy
 #include "nsIDOMSelection.h"
+
+#ifndef NEW_CLIPBOARD_SUPPORT
 #include "nsISelectionMgr.h"
+#endif
 
 // XXX For font setting below
 #include "nsFont.h"
@@ -1976,9 +1979,14 @@ nsBrowserWindow::DoCopy()
 {
   nsIPresShell* shell = GetPresShell();
   if (nsnull != shell) {
+
+#ifndef NEW_CLIPBOARD_SUPPORT
     nsISelectionMgr* selectionMgr;
     if (NS_SUCCEEDED(mAppShell->GetSelectionMgr(&selectionMgr)))
       shell->DoCopy(selectionMgr);
+#else
+    shell->DoCopy();
+#endif
     NS_RELEASE(shell);
   }
 }