Bug 203093 - Move ActiveXObject --> NSActiveXObject. r=adamlock, sr=alecf, a=sspitzer

js/src/xpconnect/src/XPCIDispatchExtension.cpp

@@ -134,11 +134,15 @@ ActiveXConstructor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
 JSBool XPCIDispatchExtension::Initialize(JSContext * aJSContext,
                                          JSObject * aGlobalJSObj)
 {
-    JSBool result = JS_DefineFunction(aJSContext, aGlobalJSObj, "ActiveXObject", 
+    JSBool result = JS_DefineFunction(aJSContext, aGlobalJSObj, 
+                                      nsXPConnect::GetRuntime()->GetStringName(
+                                          XPCJSRuntime::IDX_ACTIVEX_OBJECT),
                                       ActiveXConstructor, 1, 0) != nsnull;
 #ifdef XPC_COMOBJECT
     if(result)
-       result = JS_DefineFunction(aJSContext, aGlobalJSObj, "COMObject", 
+       result = JS_DefineFunction(aJSContext, aGlobalJSObj, 
+                                  nsXPConnect::GetRuntime()->GetStringName(
+                                      XPCJSRuntime::IDX_COM_OBJECT),
                                   COMObjectConstructor, 1, 0) != nsnull;
 #endif
     return result;

js/src/xpconnect/src/xpcjsruntime.cpp

@@ -53,7 +53,7 @@ const char* XPCJSRuntime::mStrings[] = {
     "prototype",            // IDX_PROTOTYPE
     "createInstance"        // IDX_CREATE_INSTANCE
 #ifdef XPC_IDISPATCH_SUPPORT
-    , "ActiveXObject"       // IDX_ACTIVEX_OBJECT
+    , "NSActiveXObject"     // IDX_ACTIVEX_OBJECT
     , "COMObject"           // IDX_COMOBJECT
 #endif
 };