Commit d6f5a8d7 authored by Glen Robertson's avatar Glen Robertson Committed by Commit Bot

digitalgoods: Reland origin trial for M88

This reverts commit ae799285.

Reason for revert: Origin trial skipped for M87, which has now
branched. Want to start origin trial in M88.

Original change's description:
> digitalgoods: Remove origin trial for DigitalGoods.
>
> This reverts commit 13771712.
>
> Reason for revert: Decided not to move to OT in M87. Delay to M88.
>
> Original change's description:
> > digitalgoods: Add origin_trial_feature_name and _os for DigitalGoods.
> >
> > Origin Trial on Android only for now.
> >
> > Bug: 1032423,1096428
> > Change-Id: I8329c798138d800156bbe3f90de6d05f2d9662b2
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2404284
> > Reviewed-by: Kentaro Hara <haraken@chromium.org>
> > Auto-Submit: Glen Robertson <glenrob@chromium.org>
> > Commit-Queue: Glen Robertson <glenrob@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#807337}
>
> Bug: 1032423
> Bug: 1096428
> Change-Id: If0f670b5901c8efc3452bb557bc33d2f5f3aecf3
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2437719
> Reviewed-by: Glen Robertson <glenrob@chromium.org>
> Reviewed-by: Kentaro Hara <haraken@chromium.org>
> Reviewed-by: Peter Conn <peconn@chromium.org>
> Auto-Submit: Glen Robertson <glenrob@chromium.org>
> Commit-Queue: Glen Robertson <glenrob@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#812519}

Bug: 1032423,1096428
Change-Id: I787a43ce82820136a65363c5be46ec035cb79ddf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2494187
Commit-Queue: Glen Robertson <glenrob@chromium.org>
Commit-Queue: Kentaro Hara <haraken@chromium.org>
Auto-Submit: Glen Robertson <glenrob@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarGlen Robertson <glenrob@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820129}
parent 83d5304f
...@@ -599,7 +599,8 @@ void ValidateAndConvertPaymentDetailsUpdate(const PaymentDetailsUpdate* input, ...@@ -599,7 +599,8 @@ void ValidateAndConvertPaymentDetailsUpdate(const PaymentDetailsUpdate* input,
if (exception_state.HadException()) if (exception_state.HadException())
return; return;
if (input->hasTotal()) { if (input->hasTotal()) {
DCHECK(!RuntimeEnabledFeatures::DigitalGoodsEnabled() || !ignore_total); DCHECK(!RuntimeEnabledFeatures::DigitalGoodsEnabled(&execution_context) ||
!ignore_total);
if (ignore_total) { if (ignore_total) {
output->total = output->total =
CreateTotalPlaceHolderForAppStoreBilling(execution_context); CreateTotalPlaceHolderForAppStoreBilling(execution_context);
...@@ -1248,8 +1249,9 @@ PaymentRequest::PaymentRequest( ...@@ -1248,8 +1249,9 @@ PaymentRequest::PaymentRequest(
if (exception_state.HadException()) if (exception_state.HadException())
return; return;
ignore_total_ = RuntimeEnabledFeatures::DigitalGoodsEnabled() && ignore_total_ =
RequestingOnlyAppStoreBillingMethods(validated_method_data); RuntimeEnabledFeatures::DigitalGoodsEnabled(GetExecutionContext()) &&
RequestingOnlyAppStoreBillingMethods(validated_method_data);
ValidateAndConvertPaymentDetailsInit(details, options_, validated_details, ValidateAndConvertPaymentDetailsInit(details, options_, validated_details,
shipping_option_, ignore_total_, shipping_option_, ignore_total_,
*GetExecutionContext(), exception_state); *GetExecutionContext(), exception_state);
......
...@@ -689,6 +689,8 @@ ...@@ -689,6 +689,8 @@
}, },
{ {
name: "DigitalGoods", name: "DigitalGoods",
origin_trial_feature_name: "DigitalGoods",
origin_trial_os: ["android"],
status: "experimental", status: "experimental",
}, },
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment