diff --git a/mozilla/js/js2/js2.cpp b/mozilla/js/js2/js2.cpp
index 3f26f0dc1ec..0eaa03f6e6b 100644
--- a/mozilla/js/js2/js2.cpp
+++ b/mozilla/js/js2/js2.cpp
@@ -157,7 +157,7 @@ static JSValue load(Context *cx, const JSValues &argv)
         for (size_t i = 1; i < n; ++i) {
             JSValue val = argv[i].toString();
             if (val.isString()) {
-                String fileName(*val.string);
+                JSString& fileName(*val.string);
                 std::string str(fileName.length(), char());
                 std::transform(fileName.begin(), fileName.end(), str.begin(), narrow);
                 FILE* f = fopen(str.c_str(), "r");
@@ -173,14 +173,13 @@ static JSValue load(Context *cx, const JSValues &argv)
 
 static JSValue loadxml(Context *cx, const JSValues &argv)
 {
-
     JSValue result;
     size_t n = argv.size();
     if (n > 1) {
         for (size_t i = 1; i < n; ++i) {
             JSValue val = argv[i].toString();
             if (val.isString()) {
-                String fileName(*val.string);
+                JSString& fileName(*val.string);
                 std::string str(fileName.length(), char());
                 std::transform(fileName.begin(), fileName.end(), str.begin(), narrow);
                 cx->loadClass(str.c_str());
diff --git a/mozilla/js2/tests/cpp/js2_shell.cpp b/mozilla/js2/tests/cpp/js2_shell.cpp
index 3f26f0dc1ec..0eaa03f6e6b 100644
--- a/mozilla/js2/tests/cpp/js2_shell.cpp
+++ b/mozilla/js2/tests/cpp/js2_shell.cpp
@@ -157,7 +157,7 @@ static JSValue load(Context *cx, const JSValues &argv)
         for (size_t i = 1; i < n; ++i) {
             JSValue val = argv[i].toString();
             if (val.isString()) {
-                String fileName(*val.string);
+                JSString& fileName(*val.string);
                 std::string str(fileName.length(), char());
                 std::transform(fileName.begin(), fileName.end(), str.begin(), narrow);
                 FILE* f = fopen(str.c_str(), "r");
@@ -173,14 +173,13 @@ static JSValue load(Context *cx, const JSValues &argv)
 
 static JSValue loadxml(Context *cx, const JSValues &argv)
 {
-
     JSValue result;
     size_t n = argv.size();
     if (n > 1) {
         for (size_t i = 1; i < n; ++i) {
             JSValue val = argv[i].toString();
             if (val.isString()) {
-                String fileName(*val.string);
+                JSString& fileName(*val.string);
                 std::string str(fileName.length(), char());
                 std::transform(fileName.begin(), fileName.end(), str.begin(), narrow);
                 cx->loadClass(str.c_str());