[Merge to M58]Chrome OS: revert the device wallpaper change within a user session.

[Merge to M58]Chrome OS: revert the device wallpaper change within a user session.

The device policy should never leak to a user's session. In the old CL
https://codereview.chromium.org/2572793003 we use the device policy
controlled wallpaper as the user wallpaper within a user's session if
there is no user wallpaper policy controlled wallpaper and no user-
defined wallpaper. This CL reverted this logic.

Note this CL is not a clean fix since I want to keep it simple to merge
back to M58. I'll do a cleaner fix after it's been merged.

BUG=705028
TBR=alemate@chromium.org

Review-Url: https://codereview.chromium.org/2772973003
Cr-Commit-Position: refs/heads/master@{#460281}
(cherry picked from commit 8c8e69e14bebb66cba7f31887865d76b24817080)

Review-Url: https://codereview.chromium.org/2789643002 .
Cr-Commit-Position: refs/branch-heads/3029@{#492}
Cr-Branched-From: 939b32ee5ba05c396eef3fd992822fcca9a2e262-refs/heads/master@{#454471}
Committed: https://chromium.googlesource.com/chromium/src/+/11a148da1e362e8ac74aebe84a1e5495208bc2b1

[xdai1, 2017-03-30 17:09:13]

Description was changed from

==========
[Merge to M58]Chrome OS: revert the device wallpaper change within a user
session.

The device policy should never leak to a user's session. In the old CL
https://codereview.chromium.org/2572793003 we use the device policy
controlled wallpaper as the user wallpaper within a user's session if
there is no user wallpaper policy controlled wallpaper and no user-
defined wallpaper. This CL reverted this logic.

Note this CL is not a clean fix since I want to keep it simple to merge
back to M58. I'll do a cleaner fix after it's been merged.

BUG=705028

Review-Url: https://codereview.chromium.org/2772973003
Cr-Commit-Position: refs/heads/master@{#460281}
(cherry picked from commit 8c8e69e14bebb66cba7f31887865d76b24817080)
==========

to

==========
[Merge to M58]Chrome OS: revert the device wallpaper change within a user
session.

The device policy should never leak to a user's session. In the old CL
https://codereview.chromium.org/2572793003 we use the device policy
controlled wallpaper as the user wallpaper within a user's session if
there is no user wallpaper policy controlled wallpaper and no user-
defined wallpaper. This CL reverted this logic.

Note this CL is not a clean fix since I want to keep it simple to merge
back to M58. I'll do a cleaner fix after it's been merged.

BUG=705028
TBR=alemate@chromium.org

Review-Url: https://codereview.chromium.org/2772973003
Cr-Commit-Position: refs/heads/master@{#460281}
(cherry picked from commit 8c8e69e14bebb66cba7f31887865d76b24817080)
==========

[xdai1, 2017-03-30 17:10:56]

Description was changed from

==========
[Merge to M58]Chrome OS: revert the device wallpaper change within a user
session.

The device policy should never leak to a user's session. In the old CL
https://codereview.chromium.org/2572793003 we use the device policy
controlled wallpaper as the user wallpaper within a user's session if
there is no user wallpaper policy controlled wallpaper and no user-
defined wallpaper. This CL reverted this logic.

Note this CL is not a clean fix since I want to keep it simple to merge
back to M58. I'll do a cleaner fix after it's been merged.

BUG=705028
TBR=alemate@chromium.org

Review-Url: https://codereview.chromium.org/2772973003
Cr-Commit-Position: refs/heads/master@{#460281}
(cherry picked from commit 8c8e69e14bebb66cba7f31887865d76b24817080)
==========

to

==========
[Merge to M58]Chrome OS: revert the device wallpaper change within a user
session.

The device policy should never leak to a user's session. In the old CL
https://codereview.chromium.org/2572793003 we use the device policy
controlled wallpaper as the user wallpaper within a user's session if
there is no user wallpaper policy controlled wallpaper and no user-
defined wallpaper. This CL reverted this logic.

Note this CL is not a clean fix since I want to keep it simple to merge
back to M58. I'll do a cleaner fix after it's been merged.

BUG=705028
TBR=alemate@chromium.org

Review-Url: https://codereview.chromium.org/2772973003
Cr-Commit-Position: refs/heads/master@{#460281}
(cherry picked from commit 8c8e69e14bebb66cba7f31887865d76b24817080)

Review-Url: https://codereview.chromium.org/2789643002 .
Cr-Commit-Position: refs/branch-heads/3029@{#492}
Cr-Branched-From:
939b32ee5ba05c396eef3fd992822fcca9a2e262-refs/heads/master@{#454471}
Committed:
https://chromium.googlesource.com/chromium/src/+/11a148da1e362e8ac74aebe84a1e...
==========

[xdai1, 2017-03-30 17:10:58]

Committed patchset #1 (id:1) manually as
11a148da1e362e8ac74aebe84a1e5495208bc2b1 (presubmit successful).