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

commit 813f80ebbcf52c45108ee09c8b682d8af502017e
Author: dcheng <dcheng@chromium.org>
Date: Wed Feb 22 10:05:33 2017

Disable flaky test ShelfAppBrowserTest.MatchingShelfIDandActiveTab

BUG= 694941 
TBR=skuhne@chromium.org

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

[modify] https://crrev.com/813f80ebbcf52c45108ee09c8b682d8af502017e/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

 Issue 694101  has been merged into this issue.

msw, maybe related to recent mojo-ification of shelf and/or shelf vs. app ids?

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

commit 8efedb10c4620871e01944c79c294be9ef04db07
Author: msw <msw@chromium.org>
Date: Tue Feb 28 02:31:26 2017

Fix browser window shelf id init; re-enable browser test.

Initialize browser window shelf ids on shortcut creation.
This was only happening on page load, etc. (after shortcut creation).

Re-enable ShelfAppBrowserTest.MatchingShelfIDandActiveTab.
I'm not sure what caused/exacerbated the recent flakiness.

BUG= 694941 
TEST=Automated; no behavior changes.
R=jamescook@chromium.org

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

[modify] https://crrev.com/8efedb10c4620871e01944c79c294be9ef04db07/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
[modify] https://crrev.com/8efedb10c4620871e01944c79c294be9ef04db07/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc