Fix poor merge

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