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

commit 613cdf8eeeaac4830b55c4b55b4377269faa2e35
Author: khmel <khmel@chromium.org>
Date: Wed Feb 08 23:07:57 2017

Discard pinning an app with non-empty launcher id.

Currently we don't support persisting Chrome shelf pin for app with
custom launcher id. We should discard the code that stores pins for
such apps in app list sync service which is not compatible with its
design.

TEST=tests passed and manually on device various pin scenarios
BUG= 689772 

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

[modify] https://crrev.com/613cdf8eeeaac4830b55c4b55b4377269faa2e35/chrome/browser/ui/BUILD.gn
[add] https://crrev.com/613cdf8eeeaac4830b55c4b55b4377269faa2e35/chrome/browser/ui/ash/app_launcher_id.cc
[add] https://crrev.com/613cdf8eeeaac4830b55c4b55b4377269faa2e35/chrome/browser/ui/ash/app_launcher_id.h
[modify] https://crrev.com/613cdf8eeeaac4830b55c4b55b4377269faa2e35/chrome/browser/ui/ash/chrome_launcher_prefs.cc
[modify] https://crrev.com/613cdf8eeeaac4830b55c4b55b4377269faa2e35/chrome/browser/ui/ash/chrome_launcher_prefs.h
[modify] https://crrev.com/613cdf8eeeaac4830b55c4b55b4377269faa2e35/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
[modify] https://crrev.com/613cdf8eeeaac4830b55c4b55b4377269faa2e35/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
[modify] https://crrev.com/613cdf8eeeaac4830b55c4b55b4377269faa2e35/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
[modify] https://crrev.com/613cdf8eeeaac4830b55c4b55b4377269faa2e35/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
[modify] https://crrev.com/613cdf8eeeaac4830b55c4b55b4377269faa2e35/chrome/browser/ui/ash/launcher/launcher_item_controller.h

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

commit fdf3c8882b164d5bc70bc52776bdade079dfefe5
Author: khmel <khmel@chromium.org>
Date: Thu Feb 09 16:58:45 2017

Reduce namespaces for ash::launcher::AppLauncherId

BUG= 689772 
TEST=git cl try

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

[modify] https://crrev.com/fdf3c8882b164d5bc70bc52776bdade079dfefe5/chrome/browser/ui/ash/app_launcher_id.cc
[modify] https://crrev.com/fdf3c8882b164d5bc70bc52776bdade079dfefe5/chrome/browser/ui/ash/app_launcher_id.h
[modify] https://crrev.com/fdf3c8882b164d5bc70bc52776bdade079dfefe5/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
[modify] https://crrev.com/fdf3c8882b164d5bc70bc52776bdade079dfefe5/chrome/browser/ui/ash/chrome_launcher_prefs.h
[modify] https://crrev.com/fdf3c8882b164d5bc70bc52776bdade079dfefe5/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
[modify] https://crrev.com/fdf3c8882b164d5bc70bc52776bdade079dfefe5/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
[modify] https://crrev.com/fdf3c8882b164d5bc70bc52776bdade079dfefe5/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
[modify] https://crrev.com/fdf3c8882b164d5bc70bc52776bdade079dfefe5/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
[modify] https://crrev.com/fdf3c8882b164d5bc70bc52776bdade079dfefe5/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
[modify] https://crrev.com/fdf3c8882b164d5bc70bc52776bdade079dfefe5/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
[modify] https://crrev.com/fdf3c8882b164d5bc70bc52776bdade079dfefe5/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
[modify] https://crrev.com/fdf3c8882b164d5bc70bc52776bdade079dfefe5/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
[modify] https://crrev.com/fdf3c8882b164d5bc70bc52776bdade079dfefe5/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
[modify] https://crrev.com/fdf3c8882b164d5bc70bc52776bdade079dfefe5/chrome/browser/ui/ash/launcher/launcher_controller_helper.h
[modify] https://crrev.com/fdf3c8882b164d5bc70bc52776bdade079dfefe5/chrome/browser/ui/ash/launcher/launcher_item_controller.h

Approving merge to M57 Chrome OS.

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

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

commit 1f9e48f79d14ac701260a68a60cddbeeb89e6f9a
Author: khmel <khmel@chromium.org>
Date: Mon Feb 13 17:34:13 2017

[Merge M57] Discard pinning an app with non-empty launcher id.

Currently we don't support persisting Chrome shelf pin for app with
custom launcher id. We should discard the code that stores pins for
such apps in app list sync service which is not compatible with its
design.

TEST=tests passed and manually on device various pin scenarios
BUG= 689772 

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

Review-Url: https://codereview.chromium.org/2684853002
Cr-Commit-Position: refs/heads/master@{#449126}
(cherry picked from commit 613cdf8eeeaac4830b55c4b55b4377269faa2e35)

Review-Url: https://codereview.chromium.org/2691043002
Cr-Commit-Position: refs/branch-heads/2987@{#476}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}

[modify] https://crrev.com/1f9e48f79d14ac701260a68a60cddbeeb89e6f9a/chrome/browser/ui/BUILD.gn
[add] https://crrev.com/1f9e48f79d14ac701260a68a60cddbeeb89e6f9a/chrome/browser/ui/ash/app_launcher_id.cc
[add] https://crrev.com/1f9e48f79d14ac701260a68a60cddbeeb89e6f9a/chrome/browser/ui/ash/app_launcher_id.h
[modify] https://crrev.com/1f9e48f79d14ac701260a68a60cddbeeb89e6f9a/chrome/browser/ui/ash/chrome_launcher_prefs.cc
[modify] https://crrev.com/1f9e48f79d14ac701260a68a60cddbeeb89e6f9a/chrome/browser/ui/ash/chrome_launcher_prefs.h
[modify] https://crrev.com/1f9e48f79d14ac701260a68a60cddbeeb89e6f9a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
[modify] https://crrev.com/1f9e48f79d14ac701260a68a60cddbeeb89e6f9a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
[modify] https://crrev.com/1f9e48f79d14ac701260a68a60cddbeeb89e6f9a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
[modify] https://crrev.com/1f9e48f79d14ac701260a68a60cddbeeb89e6f9a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
[modify] https://crrev.com/1f9e48f79d14ac701260a68a60cddbeeb89e6f9a/chrome/browser/ui/ash/launcher/launcher_item_controller.h