Make NFC.cpp use JSON::Stringify

third_party/WebKit/Source/modules/nfc/NFC.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/nfc/NFC.h"
 
 #include "bindings/core/v8/JSONValuesForV8.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/V8ArrayBuffer.h"
+#include "bindings/core/v8/V8StringResource.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "modules/nfc/NFCError.h"
 #include "modules/nfc/NFCMessage.h"
 #include "modules/nfc/NFCPushOptions.h"
 #include "platform/mojo/MojoHelper.h"
 #include "public/platform/InterfaceProvider.h"
@@ skipping 146 matching lines @@
     if (value->IsNumber())
       return mojo::WTFArray<uint8_t>::From(
           WTF::String::number(value.As<v8::Number>()->Value()));
 
     if (value->IsString()) {
       blink::V8StringResource<> stringResource = value;
       if (stringResource.prepare())
         return mojo::WTFArray<uint8_t>::From<WTF::String>(stringResource);
     }
 
-    if (value->IsObject() && !value->IsArrayBuffer()) {
-      std::unique_ptr<blink::JSONValue> jsonResult =
-          blink::toJSONValue(scriptValue.context(), value);
-      if (jsonResult && (jsonResult->getType() == blink::JSONValue::TypeObject))
-        return mojo::WTFArray<uint8_t>::From(jsonResult->toJSONString());
+    if (value->IsObject() && !value->IsArray() && !value->IsArrayBuffer()) {
+      v8::Local<v8::String> jsonString;
+      if (v8::JSON::Stringify(scriptValue.context(), value.As<v8::Object>())
+              .ToLocal(&jsonString)) {
+        WTF::String wtfString = blink::v8StringToWebCoreString<WTF::String>(
+            jsonString, blink::DoNotExternalize);
+        return mojo::WTFArray<uint8_t>::From(wtfString);
+      }
     }
 
     if (value->IsArrayBuffer())
       return mojo::WTFArray<uint8_t>::From(
           blink::V8ArrayBuffer::toImpl(value.As<v8::Object>()));
 
     return nullptr;
   }
 };
 
@@ skipping 391 matching lines @@
   // TODO(shalamov): Not implemented.
 }
 
 DEFINE_TRACE(NFC) {
   PageVisibilityObserver::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
   visitor->trace(m_requests);
 }
 
 }  // namespace blink