Rebaseline against r155279

TBR=ccameron
BUG=

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

git-svn-id: svn://svn.chromium.org/blink/trunk@155310 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Rebaseline against r155279 continues...

TBR=ccameron
BUG=

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

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