• Katie Dektar's avatar
    Revert "[Android] Move NfcSystemLevelSetting and modularize NFC code" · 1884f5b9
    Katie Dektar authored
    This reverts commit 0db01e1d.
    
    Reason for revert: Appears to cause a compile failure and closed the tree
    
    Original change's description:
    > [Android] Move NfcSystemLevelSetting and modularize NFC code
    > 
    > NfcSystemLevelSetting is not a shared class used by multiple Settings
    > screens, so move it out of the  org.chromium.chrome.browser.settings
    > package to org.chromium.chrome.browser.nfc instead.
    > 
    > Since the classes in org.chromium.chrome.browser.nfc are fairly trivial
    > to modularize, organize and build to a separate target in
    > //chrome/browser/nfc as part of go/chrome-hoa efforts.
    > 
    > Bug: 1052056
    > Change-Id: Ia402340b05596ad880f16aef9521003658c1e2a5
    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2032785
    > Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
    > Reviewed-by: Colin Blundell <blundell@chromium.org>
    > Reviewed-by: Theresa  <twellington@chromium.org>
    > Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
    > Reviewed-by: Patrick Noland <pnoland@chromium.org>
    > Reviewed-by: Peter Wen <wnwen@chromium.org>
    > Cr-Commit-Position: refs/heads/master@{#741173}
    
    TBR=yfriedman@chromium.org,wnwen@chromium.org,engedy@chromium.org,blundell@chromium.org,twellington@chromium.org,pnoland@chromium.org,chouinard@chromium.org
    
    Change-Id: I4b89ae8773c38139c28ea7e1557217fc7abb98a6
    No-Presubmit: true
    No-Tree-Checks: true
    No-Try: true
    Bug: 1052056
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2055589Reviewed-by: default avatarKatie Dektar <katie@chromium.org>
    Commit-Queue: Katie Dektar <katie@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#741192}
    1884f5b9
nfc_permission_context_unittest.cc 14.5 KB