Bug 1586991 part 3 - Use JSLinearString instead of JSFlatString in some jsapi-tests. r=jwalden

Depends on D48487

Differential Revision: https://phabricator.services.mozilla.com/D48488

--HG--
extra : moz-landing-system : lando

js/src/jsapi-tests/testErrorInterceptor.cpp

@@ -105,8 +105,8 @@ BEGIN_TEST(testErrorInterceptor) {
 
     js::JSStringBuilder buffer(cx);
     CHECK(ValueToStringBuffer(cx, exn, buffer));
-    JS::Rooted<JSFlatString*> flat(cx, buffer.finishString());
-    CHECK(equalStrings(cx, flat, gLatestMessage));
+    JS::Rooted<JSLinearString*> linear(cx, buffer.finishString());
+    CHECK(equalStrings(cx, linear, gLatestMessage));
 
     // Cleanup.
     gLatestMessage = nullptr;
@@ -130,8 +130,8 @@ BEGIN_TEST(testErrorInterceptor) {
 
     js::JSStringBuilder buffer(cx);
     CHECK(ValueToStringBuffer(cx, exn, buffer));
-    JS::Rooted<JSFlatString*> flat(cx, buffer.finishString());
-    CHECK(js::StringEqualsAscii(flat, TO_STRING[i]));
+    JS::Rooted<JSLinearString*> linear(cx, buffer.finishString());
+    CHECK(js::StringEqualsAscii(linear, TO_STRING[i]));
 
     // Cleanup.
     gLatestMessage = nullptr;

js/src/jsapi-tests/testParseJSON.cpp

@@ -79,7 +79,7 @@ BEGIN_TEST(testParseJSON_success) {
   expected.setDouble(std::numeric_limits<double>::infinity());
   CHECK(TryParse(cx, "9e99999", expected));
 
-  JS::Rooted<JSFlatString*> str(cx);
+  JS::Rooted<JSLinearString*> str(cx);
 
   const char16_t emptystr[] = {'\0'};
   str = js::NewStringCopyN<CanGC>(cx, emptystr, 0);
@@ -152,7 +152,7 @@ BEGIN_TEST(testParseJSON_success) {
 }
 
 template <size_t N>
-static JSFlatString* NewString(JSContext* cx, const char16_t (&chars)[N]) {
+static JSLinearString* NewString(JSContext* cx, const char16_t (&chars)[N]) {
   return js::NewStringCopyN<CanGC>(cx, chars, N);
 }