Fix regressions from bug 201560: forward/back reversal on key presses, and an annoying assertion. r=dbradley/brade, sr=peterv.

dom/src/base/nsGlobalWindow.cpp

@@ -305,7 +305,7 @@ GlobalWindowImpl::ClearControllers()
       nsCOMPtr<nsIController> controller;
       mControllers->GetControllerAt(count, getter_AddRefs(controller));
 
-      nsCOMPtr<nsIControllerContext> context = do_GetInterface(controller);
+      nsCOMPtr<nsIControllerContext> context = do_QueryInterface(controller);
       if (context)
         context->SetCommandContext(nsnull);
     }

dom/src/base/nsGlobalWindowCommands.cpp

@@ -819,8 +819,8 @@ nsWindowCommandRegistration::RegisterWindowCommands(
   NS_REGISTER_FIRST_COMMAND(nsClipboardSelectAllNoneCommands, sSelectAllString);
   NS_REGISTER_LAST_COMMAND(nsClipboardSelectAllNoneCommands, sSelectNoneString);
 
-  NS_REGISTER_ONE_COMMAND(nsGoForwardCommand, "cmd_browserBack");
-  NS_REGISTER_ONE_COMMAND(nsGoBackCommand, "cmd_browserForward");
+  NS_REGISTER_ONE_COMMAND(nsGoBackCommand, "cmd_browserBack");
+  NS_REGISTER_ONE_COMMAND(nsGoForwardCommand, "cmd_browserForward");
 
   return rv;
 }