DevTools: Re-land r167880 with a fix for browser_tests

TBR=pfeldman

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

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