• Reilly Grant's avatar
    Reland "[WebNFC] Enable feature flag by default for Origin Trial" · 46961b1f
    Reilly Grant authored
    This reverts commit b2543971.
    
    Reason for revert: The underlying cause of crbug/1055216 has been fixed.
    
    Original change's description:
    > Revert "[WebNFC] Enable feature flag by default for Origin Trial"
    > 
    > This reverts commit 22b25dd3.
    > 
    > Reason for revert: NFC settings crash on Android L and M. (crbug/1055216)
    > 
    > Original change's description:
    > > [WebNFC] Enable feature flag by default for Origin Trial
    > >
    > > For the WebNFC Origin Trial the feature flag needs to be enabled by
    > > default and configured as "disable only" in runtime_features.cc so that
    > > it can still be used as a kill switch but will not enable the feature
    > > on sites which don't have a valid Origin Trial token.
    > >
    > > Bug: 1035048
    > > Change-Id: I139a79dd0f93013bc59d5023017b49c820532fb1
    > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2052198
    > > Commit-Queue: Reilly Grant <reillyg@chromium.org>
    > > Reviewed-by: Charlie Reis <creis@chromium.org>
    > > Cr-Commit-Position: refs/heads/master@{#743309}
    > 
    > TBR=creis@chromium.org,reillyg@chromium.org
    > 
    > # Not skipping CQ checks because original CL landed > 1 day ago.
    > 
    > Bug: 1035048, 1055216
    > Change-Id: I6617ee1b2bc6b3d1fb719d0454d4f8f4735bd44c
    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2070106
    > Reviewed-by: Reilly Grant <reillyg@chromium.org>
    > Reviewed-by: Charlie Reis <creis@chromium.org>
    > Commit-Queue: Reilly Grant <reillyg@chromium.org>
    > Cr-Commit-Position: refs/heads/master@{#743984}
    
    TBR=creis@chromium.org,reillyg@chromium.org
    
    # Not skipping CQ checks because original CL landed > 1 day ago.
    
    Bug: 1035048, 1055216
    Change-Id: Ifc09be93e634ce418e21d2b8482eb38a07b2e8cb
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2079159Reviewed-by: default avatarReilly Grant <reillyg@chromium.org>
    Commit-Queue: Reilly Grant <reillyg@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#745590}
    46961b1f
content_features.cc 40.5 KB