From 64cf58028c003c86919881746a912abbfe3e8346 Mon Sep 17 00:00:00 2001 From: "dglazkov@chromium.org" Date: Fri, 16 Nov 2012 20:31:09 +0000 Subject: WebKit Roll 134928:134966. TBR=haraken BUG= TEST= Review URL: https://codereview.chromium.org/11413038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168279 0039d316-1c4b-4281-b951-d872f2087c98 --- DEPS | 2 +- chrome/test/data/extensions/platform_apps/restrictions/main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 3fc94e1..0d3197c 100644 --- a/DEPS +++ b/DEPS @@ -8,7 +8,7 @@ vars = { "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s", "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", "nacl_trunk": "http://src.chromium.org/native_client/trunk", - "webkit_revision": "134928", + "webkit_revision": "134966", "chromium_git": "http://chromium.googlesource.com", "chromiumos_git": "https://chromium.googlesource.com/chromiumos", diff --git a/chrome/test/data/extensions/platform_apps/restrictions/main.js b/chrome/test/data/extensions/platform_apps/restrictions/main.js index 17af4b7..1c50ca2 100644 --- a/chrome/test/data/extensions/platform_apps/restrictions/main.js +++ b/chrome/test/data/extensions/platform_apps/restrictions/main.js @@ -122,7 +122,7 @@ chrome.test.runTests([ var xhr = new XMLHttpRequest(); assertThrowsError(function() { xhr.open('GET', 'data:should not load', false); - }, 'INVALID_ACCESS_ERR: DOM Exception 15'); + }, 'InvalidAccessError: DOM Exception 15'); succeed(); }, -- cgit v1.1