The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/877b2113a4375f07ec1cd07a7ab4c417d957a37e

commit 877b2113a4375f07ec1cd07a7ab4c417d957a37e
Author: hunyadym <hunyadym@chromium.org>
Date: Mon Jan 23 16:52:14 2017

Use source parameter too to determine policy priority.

This fixes the problem of Enterprise default policies sometimes
overwriting Active Directory-set policies.

BUG= 683150 

Review-Url: https://codereview.chromium.org/2641343002
Cr-Commit-Position: refs/heads/master@{#445389}

[modify] https://crrev.com/877b2113a4375f07ec1cd07a7ab4c417d957a37e/components/policy/core/common/policy_map.cc
[modify] https://crrev.com/877b2113a4375f07ec1cd07a7ab4c417d957a37e/components/policy/core/common/policy_map.h
[modify] https://crrev.com/877b2113a4375f07ec1cd07a7ab4c417d957a37e/components/policy/core/common/policy_map_unittest.cc

Your change meets the bar and is auto-approved for M57. Please go ahead and merge the CL to branch 2987 manually. Please contact milestone owner if you have questions.
Owners: amineer@(clank), cmasso@(bling), ketakid@(cros), govind@(desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

This has been merged:

https://chromium.googlesource.com/chromium/src.git/+/4553996f1fa4725d1fcab5214c5889b7172fd5b5

bulk Verify of older or not-user-facing Chromad bugs