From 41cd85b60475c0e8c8d261e38bc100f6c7367f99 Mon Sep 17 00:00:00 2001
From: Chris Leary <cdleary@mozilla.com>
Date: Thu, 23 Sep 2010 16:48:35 -0700
Subject: [PATCH] Back out b70659aca040, burning XPCShell tests. (no_r=me)

---
 js/src/jsapi.cpp                                   | 10 ----------
 js/src/jsapi.h                                     |  7 -------
 js/src/xpconnect/loader/mozJSSubScriptLoader.cpp   | 11 ++---------
 js/src/xpconnect/tests/unit/bug596580_versioned.js |  4 ----
 js/src/xpconnect/tests/unit/test_bug596580.js      | 19 -------------------
 5 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 js/src/xpconnect/tests/unit/bug596580_versioned.js
 delete mode 100644 js/src/xpconnect/tests/unit/test_bug596580.js

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 6c8fd26061..902ba10bd8 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -4808,16 +4808,6 @@ JS_EvaluateScriptForPrincipals(JSContext *cx, JSObject *obj, JSPrincipals *princ
 }
 
 JS_PUBLIC_API(JSBool)
-JS_EvaluateScriptForPrincipalsVersion(JSContext *cx, JSObject *obj, JSPrincipals *principals,
-                                      const char *bytes, uintN nbytes,
-                                      const char *filename, uintN lineno, jsval *rval, JSVersion version)
-{
-    AutoVersionAPI avi(cx, version);
-    return JS_EvaluateScriptForPrincipals(cx, obj, principals, bytes, nbytes, filename, lineno,
-                                          rval);
-}
-
-JS_PUBLIC_API(JSBool)
 JS_EvaluateScript(JSContext *cx, JSObject *obj, const char *bytes, uintN nbytes,
                   const char *filename, uintN lineno, jsval *rval)
 {
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index d4e9c33635..a406b86ae6 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -2583,13 +2583,6 @@ JS_EvaluateScriptForPrincipals(JSContext *cx, JSObject *obj,
                                jsval *rval);
 
 extern JS_PUBLIC_API(JSBool)
-JS_EvaluateScriptForPrincipalsVersion(JSContext *cx, JSObject *obj,
-                                      JSPrincipals *principals,
-                                      const char *bytes, uintN length,
-                                      const char *filename, uintN lineno,
-                                      jsval *rval, JSVersion version);
-
-extern JS_PUBLIC_API(JSBool)
 JS_EvaluateUCScript(JSContext *cx, JSObject *obj,
                     const jschar *chars, uintN length,
                     const char *filename, uintN lineno,
diff --git a/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp b/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
index e10bce636a..7c3f145bfe 100644
--- a/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
+++ b/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
@@ -60,8 +60,6 @@
 #include "jsapi.h"
 #include "jsdbgapi.h"
 #include "jsobj.h"
-#include "jsscript.h"
-#include "jscntxt.h"
 
 #include "mozilla/FunctionTimer.h"
 
@@ -235,7 +233,6 @@ mozJSSubScriptLoader::LoadSubScript (const PRUnichar * aURL
 
     JSStackFrame* frame = nsnull;
     JSScript* script = nsnull;
-    JSVersion version;
 
     // Figure out who's calling us
     do
@@ -351,12 +348,8 @@ mozJSSubScriptLoader::LoadSubScript (const PRUnichar * aURL
      * exceptions, including the source/line number */
     er = JS_SetErrorReporter (cx, mozJSLoaderErrorReporter);
 
-    version = script->getVersion();
-    version = JSVersion((version & js::VersionFlags::MASK)
-                        | (version & js::VersionFlags::HAS_XML));
-    ok = JS_EvaluateScriptForPrincipalsVersion(cx, target_obj, jsPrincipals,
-                                               buf, len, uriStr.get(), 1,
-                                               rval, version);
+    ok = JS_EvaluateScriptForPrincipals (cx, target_obj, jsPrincipals,
+                                         buf, len, uriStr.get(), 1, rval);        
     /* repent for our evil deeds */
     JS_SetErrorReporter (cx, er);
 
diff --git a/js/src/xpconnect/tests/unit/bug596580_versioned.js b/js/src/xpconnect/tests/unit/bug596580_versioned.js
deleted file mode 100644
index a9c220344e..0000000000
--- a/js/src/xpconnect/tests/unit/bug596580_versioned.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Some constructs that require a high default version number. */
-let x = 12;
-function simpleGen() { yield 12; }
-var e4xy = <html><title>Huzzah!</title></html>
diff --git a/js/src/xpconnect/tests/unit/test_bug596580.js b/js/src/xpconnect/tests/unit/test_bug596580.js
deleted file mode 100644
index 00778060bb..0000000000
--- a/js/src/xpconnect/tests/unit/test_bug596580.js
+++ /dev/null
@@ -1,19 +0,0 @@
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-function run_test() {
-  var file = do_get_file("bug596580_versioned.js");
-  var ios = Cc["@mozilla.org/network/io-service;1"]
-              .getService(Ci.nsIIOService);
-  var uri = ios.newFileURI(file);
-  var scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
-                       .getService(Ci.mozIJSSubScriptLoader);
-  scriptLoader.loadSubScript(uri.spec);
-  version(150)
-  try {
-      scriptLoader.loadSubScript(uri.spec);
-      throw new Exception("Subscript should fail to load.");
-  } catch (e if e instanceof SyntaxError) {
-      // Okay.
-  }
-}
-- 
2.11.4.GIT