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

commit 832d8b7c8aff004eb7480fd0d20ce0508b24d7f4
Author: khmel <khmel@chromium.org>
Date: Mon May 08 18:38:11 2017

arc: Prevent overwriting of the Chrome  Play Store icon.

This implement correct access to ARC icon from notification manager and
from ARC kiosk handler. Incorrect access to the Play Store icon caused
request to extract this app icon from ARC side and which finally
overwrote Chrome Play Store icon, which was not expected.

TEST=Manually, Ensure that Play Store notification icon (in
     notification settings) correctly loaded with Chrome version of
     Play Store. Also checked arc.app icon cache to confirm that
     Android version of Play Store icon did not exist there.
BUG= 719118 

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

[modify] https://crrev.com/832d8b7c8aff004eb7480fd0d20ce0508b24d7f4/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.cc
[modify] https://crrev.com/832d8b7c8aff004eb7480fd0d20ce0508b24d7f4/chrome/browser/notifications/arc_application_notifier_source_chromeos.cc
[modify] https://crrev.com/832d8b7c8aff004eb7480fd0d20ce0508b24d7f4/chrome/browser/ui/app_list/arc/arc_app_icon.cc
[modify] https://crrev.com/832d8b7c8aff004eb7480fd0d20ce0508b24d7f4/chrome/browser/ui/app_list/arc/arc_app_icon.h

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

commit 8e5c1b368019c5b223a0f201c5405308bf1fa393
Author: khmel <khmel@chromium.org>
Date: Tue May 09 18:32:05 2017

[Merge M59] arc: Prevent overwriting of the Chrome  Play Store icon.

This implement correct access to ARC icon from notification manager and
from ARC kiosk handler. Incorrect access to the Play Store icon caused
request to extract this app icon from ARC side and which finally
overwrote Chrome Play Store icon, which was not expected.

TEST=Manually, Ensure that Play Store notification icon (in
     notification settings) correctly loaded with Chrome version of
     Play Store. Also checked arc.app icon cache to confirm that
     Android version of Play Store icon did not exist there.
BUG= 719118 
TBR=xiyuan@chromium.org,yoshiki@chromium.org
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2865813002
Cr-Commit-Position: refs/heads/master@{#470058}
(cherry picked from commit 832d8b7c8aff004eb7480fd0d20ce0508b24d7f4)

Review-Url: https://codereview.chromium.org/2864243006
Cr-Commit-Position: refs/branch-heads/3071@{#483}
Cr-Branched-From: a106f0abbf69dad349d4aaf4bcc4f5d376dd2377-refs/heads/master@{#464641}

[modify] https://crrev.com/8e5c1b368019c5b223a0f201c5405308bf1fa393/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.cc
[modify] https://crrev.com/8e5c1b368019c5b223a0f201c5405308bf1fa393/chrome/browser/notifications/arc_application_notifier_source_chromeos.cc
[modify] https://crrev.com/8e5c1b368019c5b223a0f201c5405308bf1fa393/chrome/browser/ui/app_list/arc/arc_app_icon.cc
[modify] https://crrev.com/8e5c1b368019c5b223a0f201c5405308bf1fa393/chrome/browser/ui/app_list/arc/arc_app_icon.h

Your change meets the bar and is auto-approved for M59. Please go ahead and merge the CL to branch 3071 manually. Please contact milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), gkihumba@(ChromeOS), Abdul Syed@(Desktop)

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

This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

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

9460.42.0, 59.0.3071.57