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

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}

TBR=haraken@chromium.org,peconn@chromium.org,glenrob@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1032423
Bug: 1096428
Change-Id: If0f670b5901c8efc3452bb557bc33d2f5f3aecf3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2437719Reviewed-by: default avatarGlen Robertson <glenrob@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarPeter 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}
parent e8da6cb7
......@@ -598,8 +598,7 @@ void ValidateAndConvertPaymentDetailsUpdate(const PaymentDetailsUpdate* input,
if (exception_state.HadException())
return;
if (input->hasTotal()) {
DCHECK(!RuntimeEnabledFeatures::DigitalGoodsEnabled(&execution_context) ||
!ignore_total);
DCHECK(!RuntimeEnabledFeatures::DigitalGoodsEnabled() || !ignore_total);
if (ignore_total) {
output->total =
CreateTotalPlaceHolderForAppStoreBilling(execution_context);
......@@ -1236,9 +1235,8 @@ PaymentRequest::PaymentRequest(
if (exception_state.HadException())
return;
ignore_total_ =
RuntimeEnabledFeatures::DigitalGoodsEnabled(GetExecutionContext()) &&
RequestingOnlyAppStoreBillingMethods(validated_method_data);
ignore_total_ = RuntimeEnabledFeatures::DigitalGoodsEnabled() &&
RequestingOnlyAppStoreBillingMethods(validated_method_data);
ValidateAndConvertPaymentDetailsInit(details, options_, validated_details,
shipping_option_, ignore_total_,
*GetExecutionContext(), exception_state);
......
......@@ -665,8 +665,6 @@
},
{
name: "DigitalGoods",
origin_trial_feature_name: "DigitalGoods",
origin_trial_os: ["android"],
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