DevTools: Roll forward r182405 with the test fixes incorporated

TBR=dgozman

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

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