Move fromJSONString to V8Binding

third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp

 // Copyright 2016 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/payments/PaymentRequest.h"
 
-#include "bindings/core/v8/JSONValuesForV8.h"
 #include "bindings/core/v8/V8BindingForTesting.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "modules/payments/PaymentTestHelper.h"
 #include "platform/heap/HeapAllocator.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 namespace {
 
@@ skipping 446 matching lines @@
   makePaymentRequestOriginSecure(scope.document());
   PaymentRequest* request = PaymentRequest::create(
       scope.getScriptState(), buildPaymentMethodDataForTest(),
       buildPaymentDetailsForTest(), scope.getExceptionState());
   EXPECT_FALSE(scope.getExceptionState().hadException());
 
   request->show(scope.getScriptState())
       .then(funcs.expectNoCall(), funcs.expectCall());
 
   request->onUpdatePaymentDetails(ScriptValue::from(
-      scope.getScriptState(),
-      fromJSONString(scope.getScriptState(), "{}", scope.getExceptionState())));
+      scope.getScriptState(), fromJSONString(scope.getScriptState()->isolate(),
+                                             "{}", scope.getExceptionState())));
   EXPECT_FALSE(scope.getExceptionState().hadException());
 }
 
 TEST(PaymentRequestTest,
      ClearShippingOptionOnPaymentDetailsUpdateWithoutShippingOptions) {
   V8TestingScope scope;
   PaymentRequestMockFunctionScope funcs(scope.getScriptState());
   makePaymentRequestOriginSecure(scope.document());
   PaymentDetails details;
   details.setTotal(buildPaymentItemForTest());
   PaymentOptions options;
   options.setRequestShipping(true);
   PaymentRequest* request = PaymentRequest::create(
       scope.getScriptState(), buildPaymentMethodDataForTest(), details, options,
       scope.getExceptionState());
   EXPECT_FALSE(scope.getExceptionState().hadException());
   EXPECT_TRUE(request->shippingOption().isNull());
   request->show(scope.getScriptState())
       .then(funcs.expectNoCall(), funcs.expectNoCall());
   String detailWithShippingOptions =
       "{\"total\": {\"label\": \"Total\", \"amount\": {\"currency\": \"USD\", "
       "\"value\": \"5.00\"}},"
       "\"shippingOptions\": [{\"id\": \"standardShippingOption\", \"label\": "
       "\"Standard shipping\", \"amount\": {\"currency\": \"USD\", \"value\": "
       "\"5.00\"}, \"selected\": true}]}";
   request->onUpdatePaymentDetails(ScriptValue::from(
       scope.getScriptState(),
-      fromJSONString(scope.getScriptState(), detailWithShippingOptions,
-                     scope.getExceptionState())));
+      fromJSONString(scope.getScriptState()->isolate(),
+                     detailWithShippingOptions, scope.getExceptionState())));
   EXPECT_FALSE(scope.getExceptionState().hadException());
   EXPECT_EQ("standardShippingOption", request->shippingOption());
   String detailWithoutShippingOptions =
       "{\"total\": {\"label\": \"Total\", \"amount\": {\"currency\": \"USD\", "
       "\"value\": \"5.00\"}}}";
 
   request->onUpdatePaymentDetails(ScriptValue::from(
       scope.getScriptState(),
-      fromJSONString(scope.getScriptState(), detailWithoutShippingOptions,
-                     scope.getExceptionState())));
+      fromJSONString(scope.getScriptState()->isolate(),
+                     detailWithoutShippingOptions, scope.getExceptionState())));
 
   EXPECT_FALSE(scope.getExceptionState().hadException());
   EXPECT_TRUE(request->shippingOption().isNull());
 }
 
 TEST(
     PaymentRequestTest,
     ClearShippingOptionOnPaymentDetailsUpdateWithMultipleUnselectedShippingOptions) {
   V8TestingScope scope;
   PaymentRequestMockFunctionScope funcs(scope.getScriptState());
   makePaymentRequestOriginSecure(scope.document());
   PaymentOptions options;
   options.setRequestShipping(true);
   PaymentRequest* request = PaymentRequest::create(
       scope.getScriptState(), buildPaymentMethodDataForTest(),
       buildPaymentDetailsForTest(), options, scope.getExceptionState());
   EXPECT_FALSE(scope.getExceptionState().hadException());
   request->show(scope.getScriptState())
       .then(funcs.expectNoCall(), funcs.expectNoCall());
   String detail =
       "{\"total\": {\"label\": \"Total\", \"amount\": {\"currency\": \"USD\", "
       "\"value\": \"5.00\"}},"
       "\"shippingOptions\": [{\"id\": \"slow\", \"label\": \"Slow\", "
       "\"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}},"
       "{\"id\": \"fast\", \"label\": \"Fast\", \"amount\": {\"currency\": "
       "\"USD\", \"value\": \"50.00\"}}]}";
 
-  request->onUpdatePaymentDetails(ScriptValue::from(
-      scope.getScriptState(), fromJSONString(scope.getScriptState(), detail,
-                                             scope.getExceptionState())));
+  request->onUpdatePaymentDetails(
+      ScriptValue::from(scope.getScriptState(),
+                        fromJSONString(scope.getScriptState()->isolate(),
+                                       detail, scope.getExceptionState())));
   EXPECT_FALSE(scope.getExceptionState().hadException());
 
   EXPECT_TRUE(request->shippingOption().isNull());
 }
 
 TEST(PaymentRequestTest, UseTheSelectedShippingOptionFromPaymentDetailsUpdate) {
   V8TestingScope scope;
   PaymentRequestMockFunctionScope funcs(scope.getScriptState());
   makePaymentRequestOriginSecure(scope.document());
   PaymentOptions options;
   options.setRequestShipping(true);
   PaymentRequest* request = PaymentRequest::create(
       scope.getScriptState(), buildPaymentMethodDataForTest(),
       buildPaymentDetailsForTest(), options, scope.getExceptionState());
   EXPECT_FALSE(scope.getExceptionState().hadException());
   request->show(scope.getScriptState())
       .then(funcs.expectNoCall(), funcs.expectNoCall());
   String detail =
       "{\"total\": {\"label\": \"Total\", \"amount\": {\"currency\": \"USD\", "
       "\"value\": \"5.00\"}},"
       "\"shippingOptions\": [{\"id\": \"slow\", \"label\": \"Slow\", "
       "\"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}},"
       "{\"id\": \"fast\", \"label\": \"Fast\", \"amount\": {\"currency\": "
       "\"USD\", \"value\": \"50.00\"}, \"selected\": true}]}";
 
-  request->onUpdatePaymentDetails(ScriptValue::from(
-      scope.getScriptState(), fromJSONString(scope.getScriptState(), detail,
-                                             scope.getExceptionState())));
+  request->onUpdatePaymentDetails(
+      ScriptValue::from(scope.getScriptState(),
+                        fromJSONString(scope.getScriptState()->isolate(),
+                                       detail, scope.getExceptionState())));
   EXPECT_FALSE(scope.getExceptionState().hadException());
 
   EXPECT_EQ("fast", request->shippingOption());
 }
 
 TEST(PaymentRequestTest, NoExceptionWithErrorMessageInUpdate) {
   V8TestingScope scope;
   PaymentRequestMockFunctionScope funcs(scope.getScriptState());
   makePaymentRequestOriginSecure(scope.document());
   PaymentRequest* request = PaymentRequest::create(
       scope.getScriptState(), buildPaymentMethodDataForTest(),
       buildPaymentDetailsForTest(), scope.getExceptionState());
   EXPECT_FALSE(scope.getExceptionState().hadException());
 
   request->show(scope.getScriptState())
       .then(funcs.expectNoCall(), funcs.expectNoCall());
   String detailWithErrorMsg =
       "{\"total\": {\"label\": \"Total\", \"amount\": {\"currency\": \"USD\", "
       "\"value\": \"5.00\"}},"
       "\"error\": \"This is an error message.\"}";
 
   request->onUpdatePaymentDetails(ScriptValue::from(
       scope.getScriptState(),
-      fromJSONString(scope.getScriptState(), detailWithErrorMsg,
+      fromJSONString(scope.getScriptState()->isolate(), detailWithErrorMsg,
                      scope.getExceptionState())));
   EXPECT_FALSE(scope.getExceptionState().hadException());
 }
 
 TEST(PaymentRequestTest,
      ShouldResolveWithEmptyShippingOptionsIfIDsOfShippingOptionsAreDuplicated) {
   V8TestingScope scope;
   PaymentRequestMockFunctionScope funcs(scope.getScriptState());
   makePaymentRequestOriginSecure(scope.document());
   PaymentDetails details;
@@ skipping 18 matching lines @@
       "{\"total\": {\"label\": \"Total\", \"amount\": {\"currency\": \"USD\", "
       "\"value\": \"5.00\"}},"
       "\"shippingOptions\": [{\"id\": \"standardShippingOption\", \"label\": "
       "\"Standard shipping\", \"amount\": {\"currency\": \"USD\", \"value\": "
       "\"5.00\"}, \"selected\": true}, {\"id\": \"standardShippingOption\", "
       "\"label\": \"Standard shipping\", \"amount\": {\"currency\": \"USD\", "
       "\"value\": \"5.00\"}, \"selected\": true}]}";
 
   request->onUpdatePaymentDetails(ScriptValue::from(
       scope.getScriptState(),
-      fromJSONString(scope.getScriptState(), detailWithShippingOptions,
-                     scope.getExceptionState())));
+      fromJSONString(scope.getScriptState()->isolate(),
+                     detailWithShippingOptions, scope.getExceptionState())));
 
   EXPECT_FALSE(scope.getExceptionState().hadException());
   EXPECT_TRUE(request->shippingOption().isNull());
 }
 
 }  // namespace
 }  // namespace blink