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

commit b1a39b125d0cc6b6994b92089ebc877b693a6ddd
Author: khmel <khmel@chromium.org>
Date: Tue Mar 14 21:13:13 2017

arc: Fix crash on deferred app launch.

This fixes regression due recent shelf refactoring when meaning
of TYPE_APP AND TYPE_SHORTCUT_APP was changed. ARC defered
launcher is allowed only over shortcuts.

TEST=Manually
BUG= 701152 

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

[modify] https://crrev.com/b1a39b125d0cc6b6994b92089ebc877b693a6ddd/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc
[modify] https://crrev.com/b1a39b125d0cc6b6994b92089ebc877b693a6ddd/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

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

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

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

commit 92716b1689b94ce7c3edf5facdf858c35fa50766
Author: khmel <khmel@chromium.org>
Date: Fri Mar 17 18:34:23 2017

[Merge M58] arc: Fix crash on deferred app launch.

This fixes regression due recent shelf refactoring when meaning
of TYPE_APP AND TYPE_SHORTCUT_APP was changed. ARC defered
launcher is allowed only over shortcuts.

TEST=Manually
BUG= 701152 
TBR=msw@chromium.org
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2747983002
Cr-Commit-Position: refs/heads/master@{#456830}
(cherry picked from commit b1a39b125d0cc6b6994b92089ebc877b693a6ddd)

Review-Url: https://codereview.chromium.org/2758873002
Cr-Commit-Position: refs/branch-heads/3029@{#272}
Cr-Branched-From: 939b32ee5ba05c396eef3fd992822fcca9a2e262-refs/heads/master@{#454471}

[modify] https://crrev.com/92716b1689b94ce7c3edf5facdf858c35fa50766/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc
[modify] https://crrev.com/92716b1689b94ce7c3edf5facdf858c35fa50766/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

9334.23.0 / 58.0.3029.39