| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "modules/payments/PaymentTestHelper.h" | 5 #include "modules/payments/PaymentTestHelper.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/ScriptState.h" | 7 #include "bindings/core/v8/ScriptState.h" |
| 8 #include "core/dom/Document.h" | 8 #include "core/dom/Document.h" |
| 9 #include "modules/payments/PaymentCurrencyAmount.h" | 9 #include "modules/payments/PaymentCurrencyAmount.h" |
| 10 #include "modules/payments/PaymentMethodData.h" | 10 #include "modules/payments/PaymentMethodData.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 itemAmount.setCurrencySystem(String()); // null string. | 37 itemAmount.setCurrencySystem(String()); // null string. |
| 38 } | 38 } |
| 39 | 39 |
| 40 if (data == PaymentTestDataValue) { | 40 if (data == PaymentTestDataValue) { |
| 41 if (modificationType == PaymentTestOverwriteValue) | 41 if (modificationType == PaymentTestOverwriteValue) |
| 42 itemAmount.setValue(valueToUse); | 42 itemAmount.setValue(valueToUse); |
| 43 } else { | 43 } else { |
| 44 itemAmount.setValue("9.99"); | 44 itemAmount.setValue("9.99"); |
| 45 } | 45 } |
| 46 | 46 |
| 47 if (data != PaymentTestDataAmount || modificationType != PaymentTestRemoveKey) | 47 if (data != kPaymentTestDataAmount || modification_type != kPaymentTestRemoveK
ey) |
| 48 original.setAmount(itemAmount); | 48 /* DO NOT SUBMIT - merge conflict marker. |
| 49 * Please spell |setAmount|, not |SetAmount| below. */ |
| 50 original.setAmount(item_amount); |
| 49 | 51 |
| 50 if (data == PaymentTestDataLabel) { | 52 if (data == kPaymentTestDataLabel) { |
| 51 if (modificationType == PaymentTestOverwriteValue) | 53 if (modification_type == kPaymentTestOverwriteValue) |
| 52 original.setLabel(valueToUse); | 54 /* DO NOT SUBMIT - merge conflict marker. |
| 55 * Please spell |setLabel|, not |SetLabel| below. */ |
| 56 original.setLabel(value_to_use); |
| 53 } else { | 57 } else { |
| 58 /* DO NOT SUBMIT - merge conflict marker. |
| 59 * Please spell |setLabel|, not |SetLabel| below. */ |
| 54 original.setLabel("Label"); | 60 original.setLabel("Label"); |
| 55 } | 61 } |
| 56 } | 62 } |
| 57 | 63 |
| 58 } // namespace | 64 } // namespace |
| 59 | 65 |
| 60 PaymentItem buildPaymentItemForTest( | 66 PaymentItem buildPaymentItemForTest( |
| 61 PaymentTestDataToChange data, | 67 PaymentTestDataToChange data, |
| 62 PaymentTestModificationType modificationType, | 68 PaymentTestModificationType modificationType, |
| 63 const String& valueToUse) { | 69 const String& valueToUse) { |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 ON_CALL(*this, call(testing::_)) | 228 ON_CALL(*this, call(testing::_)) |
| 223 .WillByDefault( | 229 .WillByDefault( |
| 224 testing::DoAll(SaveValueIn(m_value), testing::ReturnArg<0>())); | 230 testing::DoAll(SaveValueIn(m_value), testing::ReturnArg<0>())); |
| 225 } | 231 } |
| 226 | 232 |
| 227 v8::Local<v8::Function> PaymentRequestMockFunctionScope::MockFunction::bind() { | 233 v8::Local<v8::Function> PaymentRequestMockFunctionScope::MockFunction::bind() { |
| 228 return bindToV8Function(); | 234 return bindToV8Function(); |
| 229 } | 235 } |
| 230 | 236 |
| 231 } // namespace blink | 237 } // namespace blink |
| OLD | NEW |