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

commit 878733d0c9eff7c0ac62070272159c967999f0d3
Author: khmel <khmel@chromium.org>
Date: Wed Sep 21 17:27:19 2016

arc: Use high-resolution icon for Play Store default item in app list.

BUG= 648998 
BUG=b/31596656
TEST=Manually on device. Painted icons different colors. 48x48 icon
     is used in shelf, 96x96 icon is used in app list.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

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

[modify] https://crrev.com/878733d0c9eff7c0ac62070272159c967999f0d3/chrome/browser/resources/chromeos/arc_support/icon/48.png
[add] https://crrev.com/878733d0c9eff7c0ac62070272159c967999f0d3/chrome/browser/resources/chromeos/arc_support/icon/96.png
[modify] https://crrev.com/878733d0c9eff7c0ac62070272159c967999f0d3/chrome/browser/resources/chromeos/arc_support/manifest.json
[modify] https://crrev.com/878733d0c9eff7c0ac62070272159c967999f0d3/chrome/browser/resources/component_extension_resources.grd
[modify] https://crrev.com/878733d0c9eff7c0ac62070272159c967999f0d3/chrome/browser/ui/app_list/arc/arc_app_icon.cc

Your change meets the bar and is auto-approved for M54 (branch: 2840)

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

commit 02843752cb6d523d4819a7e0a92f6335322930a0
Author: khmel <khmel@chromium.org>
Date: Thu Sep 22 17:44:15 2016

[Merge-M54] arc: Use high-resolution icon for Play Store default item in app list.

BUG= 648998 
BUG=b/31596656
TEST=Manually on device. Painted icons different colors. 48x48 icon
     is used in shelf, 96x96 icon is used in app list.

TBR=reviewer@chromium.org
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2358073002
Cr-Commit-Position: refs/heads/master@{#420093}
(cherry picked from commit 878733d0c9eff7c0ac62070272159c967999f0d3)

Review-Url: https://codereview.chromium.org/2360933003
Cr-Commit-Position: refs/branch-heads/2840@{#492}
Cr-Branched-From: 1ae106dbab4bddd85132d5b75c670794311f4c57-refs/heads/master@{#414607}

[modify] https://crrev.com/02843752cb6d523d4819a7e0a92f6335322930a0/chrome/browser/resources/chromeos/arc_support/icon/48.png
[add] https://crrev.com/02843752cb6d523d4819a7e0a92f6335322930a0/chrome/browser/resources/chromeos/arc_support/icon/96.png
[modify] https://crrev.com/02843752cb6d523d4819a7e0a92f6335322930a0/chrome/browser/resources/chromeos/arc_support/manifest.json
[modify] https://crrev.com/02843752cb6d523d4819a7e0a92f6335322930a0/chrome/browser/resources/component_extension_resources.grd
[modify] https://crrev.com/02843752cb6d523d4819a7e0a92f6335322930a0/chrome/browser/ui/app_list/arc/arc_app_icon.cc

Re-opening. There was a typo in the previous fix.

Need to land another: https://codereview.chromium.org/2360873004/

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

commit 74afbf8b83b12fb72e76a7bc676555c3956fdfa8
Author: hshi <hshi@chromium.org>
Date: Fri Sep 23 03:58:48 2016

arc: Use high-resolution icon for Play Store default item for scale >= 1.5f.

There was previously a typo in this line. We should pick the high-resolution
icon when scale >= 1.5f and the low-resolution icon otherwise.

BUG= 648998 
BUG=b/31596656
TEST=samus verify icon is high resolution in app list before arc opt-in
TBR=xiyuan

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

[modify] https://crrev.com/74afbf8b83b12fb72e76a7bc676555c3956fdfa8/chrome/browser/ui/app_list/arc/arc_app_icon.cc

Request merge of r420572, to M-54

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

commit 19a0e001c069ae2378829cc3f49d45d12a27a854
Author: hshi <hshi@chromium.org>
Date: Fri Sep 23 13:54:33 2016

arc: Use high-resolution icon for Play Store default item for scale >= 1.5f.

There was previously a typo in this line. We should pick the high-resolution
icon when scale >= 1.5f and the low-resolution icon otherwise.

BUG= 648998 
BUG=b/31596656
TEST=samus verify icon is high resolution in app list before arc opt-in
TBR=xiyuan

Review-Url: https://codereview.chromium.org/2360873004
Cr-Commit-Position: refs/heads/master@{#420572}
(cherry picked from commit 74afbf8b83b12fb72e76a7bc676555c3956fdfa8)

NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2359423002
Cr-Commit-Position: refs/branch-heads/2840@{#510}
Cr-Branched-From: 1ae106dbab4bddd85132d5b75c670794311f4c57-refs/heads/master@{#414607}

[modify] https://crrev.com/19a0e001c069ae2378829cc3f49d45d12a27a854/chrome/browser/ui/app_list/arc/arc_app_icon.cc

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

commit 02843752cb6d523d4819a7e0a92f6335322930a0
Author: khmel <khmel@chromium.org>
Date: Thu Sep 22 17:44:15 2016

[Merge-M54] arc: Use high-resolution icon for Play Store default item in app list.

BUG= 648998 
BUG=b/31596656
TEST=Manually on device. Painted icons different colors. 48x48 icon
     is used in shelf, 96x96 icon is used in app list.

TBR=reviewer@chromium.org
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2358073002
Cr-Commit-Position: refs/heads/master@{#420093}
(cherry picked from commit 878733d0c9eff7c0ac62070272159c967999f0d3)

Review-Url: https://codereview.chromium.org/2360933003
Cr-Commit-Position: refs/branch-heads/2840@{#492}
Cr-Branched-From: 1ae106dbab4bddd85132d5b75c670794311f4c57-refs/heads/master@{#414607}

[modify] https://crrev.com/02843752cb6d523d4819a7e0a92f6335322930a0/chrome/browser/resources/chromeos/arc_support/icon/48.png
[add] https://crrev.com/02843752cb6d523d4819a7e0a92f6335322930a0/chrome/browser/resources/chromeos/arc_support/icon/96.png
[modify] https://crrev.com/02843752cb6d523d4819a7e0a92f6335322930a0/chrome/browser/resources/chromeos/arc_support/manifest.json
[modify] https://crrev.com/02843752cb6d523d4819a7e0a92f6335322930a0/chrome/browser/resources/component_extension_resources.grd
[modify] https://crrev.com/02843752cb6d523d4819a7e0a92f6335322930a0/chrome/browser/ui/app_list/arc/arc_app_icon.cc

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

commit 19a0e001c069ae2378829cc3f49d45d12a27a854
Author: hshi <hshi@chromium.org>
Date: Fri Sep 23 13:54:33 2016

arc: Use high-resolution icon for Play Store default item for scale >= 1.5f.

There was previously a typo in this line. We should pick the high-resolution
icon when scale >= 1.5f and the low-resolution icon otherwise.

BUG= 648998 
BUG=b/31596656
TEST=samus verify icon is high resolution in app list before arc opt-in
TBR=xiyuan

Review-Url: https://codereview.chromium.org/2360873004
Cr-Commit-Position: refs/heads/master@{#420572}
(cherry picked from commit 74afbf8b83b12fb72e76a7bc676555c3956fdfa8)

NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2359423002
Cr-Commit-Position: refs/branch-heads/2840@{#510}
Cr-Branched-From: 1ae106dbab4bddd85132d5b75c670794311f4c57-refs/heads/master@{#414607}

[modify] https://crrev.com/19a0e001c069ae2378829cc3f49d45d12a27a854/chrome/browser/ui/app_list/arc/arc_app_icon.cc