--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1049,17 +1049,17 @@ pref("devtools.editor.expandtab", true);
 //
 // Available components:
 //   "textarea" - this is a basic text editor, like an HTML <textarea>.
 //
 //   "orion" - this is the Orion source code editor from the Eclipse project. It
 //   provides programmer-specific editor features such as syntax highlighting,
 //   indenting and bracket recognition. It may not be appropriate for all
 //   locales (esp. RTL) or a11y situations.
-pref("devtools.editor.component", "textarea");
+pref("devtools.editor.component", "orion");
 
 // Whether the character encoding menu is under the main Firefox button. This
 // preference is a string so that localizers can alter it.
 pref("browser.menu.showCharacterEncoding", "chrome://browser/locale/browser.properties");
 
 // Allow using tab-modal prompts when possible.
 pref("prompts.tab_modal.enabled", true);
 // Whether the Panorama should animate going in/out of tabs

--- a/xpcom/tests/TestHarness.h
+++ b/xpcom/tests/TestHarness.h
@@ -39,16 +39,24 @@
  * Test harness for XPCOM objects, providing a scoped XPCOM initializer,
  * nsCOMPtr, nsRefPtr, do_CreateInstance, do_GetService, ns(Auto|C|)String,
  * and stdio.h/stdlib.h.
  */
 
 #ifndef TestHarness_h__
 #define TestHarness_h__
 
+#if defined(_MSC_VER) && defined(MOZ_STATIC_JS)
+/*
+ * Including jsdbgapi.h may cause build break with --disable-shared-js
+ * This is a workaround for bug 673616.
+ */
+#define STATIC_JS_API
+#endif
+
 #include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
 #include "nsStringGlue.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"