• Julian Pastarmov's avatar
    Revert "Merge old and new list policies that were renamed" · ecaf0275
    Julian Pastarmov authored
    This reverts commit b53e31ad.
    
    Reason for revert: Crashes on Canary https://crbug.com/1148731
    
    Original change's description:
    > Merge old and new list policies that were renamed
    >
    > This change moves migrating of renamed policies from the PolicyHandler
    > to a PolicyMigrator that happens right after the PolicyMerger has run.
    > This guarantees that list policies can be properly merged between
    > sources even if different sources provide different naming.
    >
    > BUG=1138572
    > TEST=browser_tests:PolicyPrefsTest.PolicyToPrefsMapping
    >
    > Change-Id: Ibe335176ef52dabbe09c076ba57ae04d1c67c1c6
    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2507771
    > Commit-Queue: Julian Pastarmov <pastarmovj@chromium.org>
    > Reviewed-by: Owen Min <zmin@chromium.org>
    > Reviewed-by: Yann Dago <ydago@chromium.org>
    > Cr-Commit-Position: refs/heads/master@{#826903}
    
    TBR=pastarmovj@chromium.org,zmin@chromium.org,ydago@chromium.org
    
    Change-Id: I550446cbe736502003862ea9965b2277306b0890
    No-Presubmit: true
    No-Tree-Checks: true
    No-Try: true
    Bug: 1138572
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2536875Reviewed-by: default avatarJulian Pastarmov <pastarmovj@chromium.org>
    Commit-Queue: Julian Pastarmov <pastarmovj@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#827231}
    ecaf0275
cloud_policy_browsertest.cc 20.7 KB