diff options
| author | dglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 20:31:09 +0000 |
|---|---|---|
| committer | dglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 20:31:09 +0000 |
| commit | 64cf58028c003c86919881746a912abbfe3e8346 (patch) | |
| tree | 6080142c72e680eef46dfe0e34ec9e6eace3abdb | |
| parent | 0c2574058477dd3c8cc8303fc7c7c68b0695c21d (diff) | |
| download | chromium_src-64cf58028c003c86919881746a912abbfe3e8346.zip chromium_src-64cf58028c003c86919881746a912abbfe3e8346.tar.gz chromium_src-64cf58028c003c86919881746a912abbfe3e8346.tar.bz2 | |
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
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/test/data/extensions/platform_apps/restrictions/main.js | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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(); }, |