Improve the 'track' and 'media' WATCHLISTS

BUG=none
NOTRY=true

Review URL: https://codereview.chromium.org/55163005

git-svn-id: svn://svn.chromium.org/blink/trunk@161155 bbb929c8-8fbe-4397-9dbb-9b2b20218538