update-w3c-deps import using blink 83a52878976eaffc8753993a7689c9c178664fba:

imported csswg-test@abaf54a8e7ec8969c9bd8e7b63fe5c1c759eedfd
imported web-platform-tests@f581ba0215965bb4dc255dd1f4ae5857f923f161

csswg-test/css-shapes-1/shape-outside/values/shape-outside-*
* 7 modified

csswg-test/css-writing-modes-3/line-box-height-vlr-*
* 6 modified

web-platform-tests/IndexedDB/
* 5 added
* remove 5 tests in storage/indexeddb that were upstreamed

web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html
* now passes, -expected.txt removed

web-platform-tests/html/webappapis/scripting/events/event-handler-attributes-body-window.html
* new test, fails some cases due to crbug.com/218205 so -expected.txt added
* test output is horrid, filed https://github.com/w3c/web-platform-tests/pull/2310

R=kojii@chromium.org
BUG=218205

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

Cr-Commit-Position: refs/heads/master@{#358517}

29 files changed, 327 insertions, 290 deletions

diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-circle-010.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-circle-010.html
index c29f193..c4a6929 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-circle-010.html
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-circle-010.html
@@ -7,7 +7,7 @@
         <link rel="reviewer" title="Alan Stearns" href="mailto:stearns@adobe.com"> <!--  2014-03-04  -->
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-circle">
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
-        <link rel="help" href="http://www.w3.org/TR/css3-values/#calc">
+        <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
         <meta name="assert" content="A circle's arguments may be in calc() values.">
         <meta name="flags" content="dom">
         <script src="../../../../../resources/testharness.js"></script>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-circle-011.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-circle-011.html
index 73c03cc..22a8c12 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-circle-011.html
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-circle-011.html
@@ -7,7 +7,7 @@
         <link rel="reviewer" title="Alan Stearns" href="mailto:stearns@adobe.com"> <!--  2014-03-04  -->
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-circle">
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
-        <link rel="help" href="http://www.w3.org/TR/css3-values/#calc">
+        <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
         <meta name="assert" content="A circle's <position> arguments may be in calc() values.">
         <meta name="flags" content="dom">
         <script src="../../../../../resources/testharness.js"></script>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-ellipse-010.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-ellipse-010.html
index 3e5ac8e..0f9dcc4 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-ellipse-010.html
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-ellipse-010.html
@@ -7,7 +7,7 @@
         <link rel="reviewer" title="Alan Stearns" href="mailto:stearns@adobe.com"> <!--  2014-03-04  -->
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-ellipse">
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
-        <link rel="help" href="http://www.w3.org/TR/css3-values/#calc">
+        <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
         <meta name="assert" content="An ellipse's arguments may be in calc() values.">
         <meta name="flags" content="dom">
         <script src="../../../../../resources/testharness.js"></script>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-ellipse-011.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-ellipse-011.html
index 9e669c0..a5de44c 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-ellipse-011.html
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-ellipse-011.html
@@ -7,7 +7,7 @@
         <link rel="reviewer" title="Alan Stearns" href="mailto:stearns@adobe.com"> <!--  2014-03-04  -->
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-ellipse">
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
-        <link rel="help" href="http://www.w3.org/TR/css3-values/#calc">
+        <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
         <meta name="assert" content="An ellipse's <position> arguments may be in calc() values.">
         <meta name="flags" content="dom">
         <script src="../../../../../resources/testharness.js"></script>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-inset-008.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-inset-008.html
index 07feefb..a8d3f17 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-inset-008.html
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-inset-008.html
@@ -7,7 +7,7 @@
         <link rel="reviewer" title="Alan Stearns" href="mailto:stearns@adobe.com"> <!--  2014-03-04  -->
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-inset">
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
-        <link rel="help" href="http://www.w3.org/TR/css3-values/#calc">
+        <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
         <meta name="assert" content="An inset's arguments may be in calc() values.">
         <meta name="flags" content="dom">
         <script src="../../../../../resources/testharness.js"></script>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-inset-009.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-inset-009.html
index fa649e3..e17b39e 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-inset-009.html
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-inset-009.html
@@ -7,7 +7,7 @@
         <link rel="reviewer" title="Alan Stearns" href="mailto:stearns@adobe.com"> <!--  2014-03-04  -->
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-inset">
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
-        <link rel="help" href="http://www.w3.org/TR/css3-values/#calc">
+        <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
         <meta name="assert" content="An inset's radial component arguments may be in calc() values.">
         <meta name="flags" content="dom">
         <script src="../../../../../resources/testharness.js"></script>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-polygon-006.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-polygon-006.html
index 1429ed0..e91f5b9 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-polygon-006.html
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-shapes-1/shape-outside/values/shape-outside-polygon-006.html
@@ -7,7 +7,7 @@
         <link rel="reviewer" title="Alan Stearns" href="mailto:stearns@adobe.com"> <!--  2014-03-04  -->
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-polygon">
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
-        <link rel="help" href="http://www.w3.org/TR/css3-values/#calc">
+        <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
         <meta name="assert" content="A polygon's arguments may be in calc() values.">
         <meta name="flags" content="dom">
         <script src="../../../../../resources/testharness.js"></script>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-003-expected.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-003-expected.xht
index f5010dd..83aee4c 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-003-expected.xht
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-003-expected.xht
@@ -21,7 +21,7 @@
       border: blue solid 2px;
       font-size: 32px;
       margin: 1em;
-      writing-mode: vertical-rl;
+      writing-mode: vertical-lr;
       text-orientation: mixed;
     }
   ]]></style>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-003.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-003.xht
index 31a6ea9..ec4e5f8 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-003.xht
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-003.xht
@@ -14,7 +14,7 @@
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" title="10.8.1 Leading and half-leading" />
-  <link rel="match" href="line-box-height-vrl-002-ref.xht" />
+  <link rel="match" href="line-box-height-vlr-003-ref.xht" />
 
   <meta content="" name="flags" />
   <meta content="This test checks that a line box height does not increase because an inline non-replaced box has a border. In this test, the '34' inline box and the '56' inline box should be lined up with its inline '12' sibling. The line box height, enclosed by the blue border should not grow to accomodate transparent 'border-left' of inline box and transparent 'border-right' of inline box." name="assert" />
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-005-expected.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-005-expected.xht
index f5010dd..83aee4c 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-005-expected.xht
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-005-expected.xht
@@ -21,7 +21,7 @@
       border: blue solid 2px;
       font-size: 32px;
       margin: 1em;
-      writing-mode: vertical-rl;
+      writing-mode: vertical-lr;
       text-orientation: mixed;
     }
   ]]></style>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-005.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-005.xht
index 15a7135..9388dbf 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-005.xht
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-005.xht
@@ -14,7 +14,7 @@
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" title="10.8.1 Leading and half-leading" />
-  <link rel="match" href="line-box-height-vrl-002-ref.xht" />
+  <link rel="match" href="line-box-height-vlr-003-ref.xht" />
 
   <meta content="" name="flags" />
   <meta content="This test checks that a line box height does not increase because an inline non-replaced box has a padding. In this test, the '34' inline box and the '56' inline box should be lined up with its inline '12' sibling. The line box height, enclosed by the blue border should not grow to accomodate transparent 'padding-left' of inline box and transparent 'padding-right' of inline box." name="assert" />
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-007-expected.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-007-expected.xht
index ca42e27..e970a17 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-007-expected.xht
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-007-expected.xht
@@ -21,7 +21,7 @@
       border: blue solid 2px;
       font-size: 32px;
       margin: 1em;
-      writing-mode: vertical-rl;
+      writing-mode: vertical-lr;
       text-orientation: sideways;
     }
   ]]></style>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-007.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-007.xht
index 78e33ed..00d9834 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-007.xht
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-007.xht
@@ -14,7 +14,7 @@
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" title="10.8.1 Leading and half-leading" />
-  <link rel="match" href="line-box-height-vrl-006-ref.xht" />
+  <link rel="match" href="line-box-height-vlr-007-ref.xht" />
 
   <meta content="" name="flags" />
   <meta content="This test checks that a line box height does not increase because an inline non-replaced box has a border. In this test, the '34' inline box and the '56' inline box should be lined up with its inline '12' sibling. The line box height, enclosed by the blue border should not grow to accomodate transparent 'border-left' of inline box and transparent 'border-right' of inline box." name="assert" />
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-009-expected.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-009-expected.xht
index ca42e27..e970a17 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-009-expected.xht
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-009-expected.xht
@@ -21,7 +21,7 @@
       border: blue solid 2px;
       font-size: 32px;
       margin: 1em;
-      writing-mode: vertical-rl;
+      writing-mode: vertical-lr;
       text-orientation: sideways;
     }
   ]]></style>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-009.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-009.xht
index ceefae3..efd67d9 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-009.xht
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-009.xht
@@ -14,7 +14,7 @@
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" title="10.8.1 Leading and half-leading" />
-  <link rel="match" href="line-box-height-vrl-006-ref.xht" />
+  <link rel="match" href="line-box-height-vlr-007-ref.xht" />
 
   <meta content="" name="flags" />
   <meta content="This test checks that a line box height does not increase because an inline non-replaced box has a padding. In this test, the '34' inline box and the '56' inline box should be lined up with its inline '12' sibling. The line box height, enclosed by the blue border should not grow to accomodate transparent 'padding-left' of inline box and transparent 'padding-right' of inline box." name="assert" />
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-011-expected.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-011-expected.xht
index f6d2ae4..b07ec50 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-011-expected.xht
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-011-expected.xht
@@ -21,7 +21,7 @@
       border: blue solid 2px;
       font-size: 32px;
       margin: 1em;
-      writing-mode: vertical-rl;
+      writing-mode: vertical-lr;
       text-orientation: upright;
     }
   ]]></style>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-011.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-011.xht
index 06aa739..a1dcc58 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-011.xht
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-011.xht
@@ -14,7 +14,7 @@
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" title="10.8.1 Leading and half-leading" />
-  <link rel="match" href="line-box-height-vrl-010-ref.xht" />
+  <link rel="match" href="line-box-height-vlr-011-ref.xht" />
 
   <meta content="" name="flags" />
   <meta content="This test checks that a line box height does not increase because an inline non-replaced box has a border. In this test, the '34' inline box and the '56' inline box should be lined up with its inline '12' sibling. The line box height, enclosed by the blue border should not grow to accomodate transparent 'border-left' of inline box and transparent 'border-right' of inline box." name="assert" />
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-013-expected.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-013-expected.xht
index f6d2ae4..b07ec50 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-013-expected.xht
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-013-expected.xht
@@ -21,7 +21,7 @@
       border: blue solid 2px;
       font-size: 32px;
       margin: 1em;
-      writing-mode: vertical-rl;
+      writing-mode: vertical-lr;
       text-orientation: upright;
     }
   ]]></style>
diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-013.xht b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-013.xht
index 89475ba..56eaa94c 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-013.xht
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-writing-modes-3/line-box-height-vlr-013.xht
@@ -14,7 +14,7 @@
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
   <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#vertical-layout" title="7.1 Principles of Layout in Vertical Writing Modes" />
   <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#line-height" title="10.8.1 Leading and half-leading" />
-  <link rel="match" href="line-box-height-vrl-010-ref.xht" />
+  <link rel="match" href="line-box-height-vlr-011-ref.xht" />
 
   <meta content="" name="flags" />
   <meta content="This test checks that a line box height does not increase because an inline non-replaced box has a padding. In this test, the '34' inline box and the '56' inline box should be lined up with its inline '12' sibling. The line box height, enclosed by the blue border should not grow to accomodate transparent 'padding-left' of inline box and transparent 'padding-right' of inline box." name="assert" />
diff --git a/third_party/WebKit/LayoutTests/storage/indexeddb/index-getall.html b/third_party/WebKit/LayoutTests/imported/web-platform-tests/IndexedDB/idbindex_getAll.html
index 400e1cd..29eac72 100644
--- a/third_party/WebKit/LayoutTests/storage/indexeddb/index-getall.html
+++ b/third_party/WebKit/LayoutTests/imported/web-platform-tests/IndexedDB/idbindex_getAll.html
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
 <title>IndexedDB: Test IDBIndex.getAll.</title>
-<script src="../../resources/testharness.js"></script>
-<script src="../../resources/testharnessreport.js"></script>
+<script src="../../../resources/testharness.js"></script>
+<script src="../../../resources/testharnessreport.js"></script>
 <script>
+setup({explicit_done: true});
 
 var alphabet = 'abcdefghijklmnopqrstuvwxyz'.split('');
 var ALPHABET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');
@@ -68,9 +69,7 @@ function createGetAllRequest(t, storeName, connection, range, maxCount) {
     var transaction = connection.transaction(storeName, 'readonly');
     var store = transaction.objectStore(storeName);
     var index = store.index('test_idx');
-    // TODO(cmumford): Simplify once crbug.com/335871 is fixed.
-    var req = maxCount !== undefined ? index.getAll(range, maxCount) :
-              range !== undefined ? index.getAll(range) : index.getAll();
+    var req = index.getAll(range, maxCount);
     req.onerror = t.unreached_func('getAll request should succeed');
     return req;
 }
@@ -82,8 +81,8 @@ doSetup(location.pathname + '-IDBIndex.getAll', 1, function(evt) {
       req.onsuccess = t.step_func(function(evt) {
           var data = evt.target.result;
           assert_class_string(data, 'Array', 'result should be an array');
-          assert_array_equals(data.map(e => e.ch), ['c']);
-          assert_array_equals(data.map(e => e.upper), ['C']);
+          assert_array_equals(data.map(function(e) { return e.ch; }), ['c']);
+          assert_array_equals(data.map(function(e) { return e.upper; }), ['C']);
           t.done();
       });
     }, 'Single item get');
@@ -102,8 +101,8 @@ doSetup(location.pathname + '-IDBIndex.getAll', 1, function(evt) {
       req.onsuccess = t.step_func(function(evt) {
           var data = evt.target.result;
           assert_class_string(data, 'Array', 'result should be an array');
-          assert_array_equals(data.map(e => e.ch), alphabet);
-          assert_array_equals(data.map(e => e.upper), ALPHABET);
+          assert_array_equals(data.map(function(e) { return e.ch; }), alphabet);
+          assert_array_equals(data.map(function(e) { return e.upper; }), ALPHABET);
           t.done();
       });
     }, 'Get all keys');
@@ -114,8 +113,8 @@ doSetup(location.pathname + '-IDBIndex.getAll', 1, function(evt) {
       req.onsuccess = t.step_func(function(evt) {
           var data = evt.target.result;
           assert_class_string(data, 'Array', 'result should be an array');
-          assert_array_equals(data.map(e => e.ch), 'abcdefghij'.split(''));
-          assert_array_equals(data.map(e => e.upper), 'ABCDEFGHIJ'.split(''));
+          assert_array_equals(data.map(function(e) { return e.ch; }), 'abcdefghij'.split(''));
+          assert_array_equals(data.map(function(e) { return e.upper; }), 'ABCDEFGHIJ'.split(''));
           t.done();
       });
     }, 'maxCount=10');
@@ -125,8 +124,8 @@ doSetup(location.pathname + '-IDBIndex.getAll', 1, function(evt) {
                                     IDBKeyRange.bound('G', 'M'));
       req.onsuccess = t.step_func(function(evt) {
           var data = evt.target.result;
-          assert_array_equals(data.map(e => e.ch), 'ghijklm'.split(''));
-          assert_array_equals(data.map(e => e.upper), 'GHIJKLM'.split(''));
+          assert_array_equals(data.map(function(e) { return e.ch; }), 'ghijklm'.split(''));
+          assert_array_equals(data.map(function(e) { return e.upper; }), 'GHIJKLM'.split(''));
           t.done();
       });
     }, 'Get bound range');
@@ -137,8 +136,8 @@ doSetup(location.pathname + '-IDBIndex.getAll', 1, function(evt) {
       req.onsuccess = t.step_func(function(evt) {
           var data = evt.target.result;
           assert_class_string(data, 'Array', 'result should be an array');
-          assert_array_equals(data.map(e => e.ch), 'ghi'.split(''));
-          assert_array_equals(data.map(e => e.upper), 'GHI'.split(''));
+          assert_array_equals(data.map(function(e) { return e.ch; }), 'ghi'.split(''));
+          assert_array_equals(data.map(function(e) { return e.upper; }), 'GHI'.split(''));
           t.done();
       });
     }, 'Get bound range with maxCount');
@@ -149,8 +148,8 @@ doSetup(location.pathname + '-IDBIndex.getAll', 1, function(evt) {
       req.onsuccess = t.step_func(function(evt) {
           var data = evt.target.result;
           assert_class_string(data, 'Array', 'result should be an array');
-          assert_array_equals(data.map(e => e.ch), 'ghij'.split(''));
-          assert_array_equals(data.map(e => e.upper), 'GHIJ'.split(''));
+          assert_array_equals(data.map(function(e) { return e.ch; }), 'ghij'.split(''));
+          assert_array_equals(data.map(function(e) { return e.upper; }), 'GHIJ'.split(''));
           t.done();
       });
     }, 'Get upper excluded');
@@ -161,8 +160,8 @@ doSetup(location.pathname + '-IDBIndex.getAll', 1, function(evt) {
       req.onsuccess = t.step_func(function(evt) {
           var data = evt.target.result;
           assert_class_string(data, 'Array', 'result should be an array');
-          assert_array_equals(data.map(e => e.ch), 'hijk'.split(''));
-          assert_array_equals(data.map(e => e.upper), 'HIJK'.split(''));
+          assert_array_equals(data.map(function(e) { return e.ch; }), 'hijk'.split(''));
+          assert_array_equals(data.map(function(e) { return e.upper; }), 'HIJK'.split(''));
           t.done();
       });
     }, 'Get lower excluded');
@@ -195,8 +194,8 @@ doSetup(location.pathname + '-IDBIndex.getAll', 1, function(evt) {
       req.onsuccess = t.step_func(function(evt) {
           var data = evt.target.result;
           assert_class_string(data, 'Array', 'result should be an array');
-          assert_array_equals(data.map(e => e.ch), alphabet);
-          assert_array_equals(data.map(e => e.upper), ALPHABET);
+          assert_array_equals(data.map(function(e) { return e.ch; }), alphabet);
+          assert_array_equals(data.map(function(e) { return e.upper; }), ALPHABET);
           t.done();
       });
     }, 'maxCount=0');
@@ -207,8 +206,8 @@ doSetup(location.pathname + '-IDBIndex.getAll', 1, function(evt) {
       req.onsuccess = t.step_func(function(evt) {
           var data = evt.target.result;
           assert_class_string(data, 'Array', 'result should be an array');
-          assert_array_equals(data.map(e => e.ch), 'abcdefghijklm'.split(''));
-          assert_true(data.every(e => e.half === 'first'));
+          assert_array_equals(data.map(function(e) { return e.ch; }), 'abcdefghijklm'.split(''));
+          assert_true(data.every(function(e) { return e.half === 'first'; }));
           t.done();
       });
     }, 'Retrieve multiEntry key');
@@ -219,12 +218,15 @@ doSetup(location.pathname + '-IDBIndex.getAll', 1, function(evt) {
       req.onsuccess = t.step_func(function(evt) {
           var data = evt.target.result;
           assert_class_string(data, 'Array', 'result should be an array');
-          assert_array_equals(data.map(e => e.ch), ['a', 'e', 'i', 'o', 'u']);
+          assert_array_equals(data.map(function(e) { return e.ch; }), ['a', 'e', 'i', 'o', 'u']);
           assert_array_equals(data[0].attribs, ['vowel', 'first']);
-          assert_true(data.every(e => e.attribs[0] === 'vowel'));
+          assert_true(data.every(function(e) { return e.attribs[0] === 'vowel'; }));
           t.done();
       });
     }, 'Retrieve one key multiple values');
+
+    // Explicit done needed in case async_test body fails synchronously.
+    done();
 });
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/storage/indexeddb/index-getallkeys.html b/third_party/WebKit/LayoutTests/imported/web-platform-tests/IndexedDB/idbindex_getAllKeys.html
index 5d5964b..4d46a18 100644
--- a/third_party/WebKit/LayoutTests/storage/indexeddb/index-getallkeys.html
+++ b/third_party/WebKit/LayoutTests/imported/web-platform-tests/IndexedDB/idbindex_getAllKeys.html
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
 <title>IndexedDB: Test IDBIndex.getAllKeys.</title>
-<script src="../../resources/testharness.js"></script>
-<script src="../../resources/testharnessreport.js"></script>
+<script src="../../../resources/testharness.js"></script>
+<script src="../../../resources/testharnessreport.js"></script>
 <script>
+setup({explicit_done: true});
 
 var alphabet = 'abcdefghijklmnopqrstuvwxyz'.split('');
 
@@ -58,10 +59,7 @@ function createGetAllKeysRequest(t, storeName, connection, range, maxCount) {
     var transaction = connection.transaction(storeName, 'readonly');
     var store = transaction.objectStore(storeName);
     var index = store.index('test_idx');
-    // TODO(cmumford): Simplify once crbug.com/335871 is fixed.
-    var req = maxCount !== undefined ? index.getAllKeys(range, maxCount) :
-              range !== undefined ? index.getAllKeys(range) :
-              index.getAllKeys();
+    var req = index.getAllKeys(range, maxCount);
     req.onerror = t.unreached_func('getAllKeys request should succeed');
     return req;
 }
@@ -111,7 +109,7 @@ doSetup(location.pathname + '-IDBIndex.getAllKeys', 1, function(evt) {
                                     10);
       req.onsuccess = t.step_func(function(evt) {
           assert_array_equals(evt.target.result,
-                             ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'],
+                             'abcdefghij'.split(''),
                              'getAllKeys() should return a..j');
           t.done();
       });
@@ -122,8 +120,8 @@ doSetup(location.pathname + '-IDBIndex.getAllKeys', 1, function(evt) {
                                     IDBKeyRange.bound('G', 'M'));
       req.onsuccess = t.step_func(function(evt) {
           assert_array_equals(evt.target.result,
-                             ['g', 'h', 'i', 'j', 'k', 'l', 'm'],
-                             'getAllKeys() should return g..m');
+                              'ghijklm'.split(''),
+                              'getAllKeys() should return g..m');
           t.done();
       });
     }, 'Get bound range');
@@ -201,6 +199,9 @@ doSetup(location.pathname + '-IDBIndex.getAllKeys', 1, function(evt) {
       });
       req.onerror = t.unreached_func('getAllKeys request should succeed');
     }, 'Retrieve multiEntry keys');
+
+    // Explicit done needed in case async_test body fails synchronously.
+    done();
 });
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/storage/indexeddb/objectstore-getall.html b/third_party/WebKit/LayoutTests/imported/web-platform-tests/IndexedDB/idbobjectstore_getAll.html
index fc4f5d1..503ee4f 100644
--- a/third_party/WebKit/LayoutTests/storage/indexeddb/objectstore-getall.html
+++ b/third_party/WebKit/LayoutTests/imported/web-platform-tests/IndexedDB/idbobjectstore_getAll.html
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
 <title>IndexedDB: Test IDBObjectStore.getAll.</title>
-<script src="../../resources/testharness.js"></script>
-<script src="../../resources/testharnessreport.js"></script>
+<script src="../../../resources/testharness.js"></script>
+<script src="../../../resources/testharnessreport.js"></script>
 <script>
+setup({explicit_done: true});
 
 var alphabet = 'abcdefghijklmnopqrstuvwxyz'.split('');
 
@@ -39,9 +40,7 @@ function doSetup(dbName, dbVersion, onsuccess) {
 function createGetAllRequest(t, storeName, connection, range, maxCount) {
     var transaction = connection.transaction(storeName, 'readonly');
     var store = transaction.objectStore(storeName);
-    // TODO(cmumford): Simplify once crbug.com/335871 is closed.
-    var req = maxCount !== undefined ? store.getAll(range, maxCount) :
-              range !== undefined ? store.getAll(range) : store.getAll();
+    var req = store.getAll(range, maxCount);
     req.onerror = t.unreached_func('getAll request should succeed');
     return req;
 }
@@ -81,7 +80,7 @@ doSetup(location.pathname + '-IDBObjectStore.getAll', 1, function(evt) {
       var req = createGetAllRequest(t, 'out-of-line', connection);
       req.onsuccess = t.step_func(function(evt) {
           assert_array_equals(evt.target.result,
-              alphabet.map(c => 'value-' + c));
+              alphabet.map(function(c) { return 'value-' + c; }));
           t.done();
       });
     }, 'Get all values');
@@ -91,8 +90,7 @@ doSetup(location.pathname + '-IDBObjectStore.getAll', 1, function(evt) {
                                     10);
       req.onsuccess = t.step_func(function(evt) {
           assert_array_equals(evt.target.result,
-              ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j']
-                  .map(c => 'value-' + c));
+              'abcdefghij'.split('').map(function(c) { return 'value-' + c; }));
           t.done();
       });
     }, 'Test maxCount');
@@ -102,8 +100,7 @@ doSetup(location.pathname + '-IDBObjectStore.getAll', 1, function(evt) {
                                     IDBKeyRange.bound('g', 'm'));
       req.onsuccess = t.step_func(function(evt) {
           assert_array_equals(evt.target.result,
-              ['g', 'h', 'i', 'j', 'k', 'l', 'm']
-                  .map(c => 'value-' + c));
+              'ghijklm'.split('').map(function(c) { return 'value-' + c; }));
           t.done();
       });
     }, 'Get bound range');
@@ -113,7 +110,7 @@ doSetup(location.pathname + '-IDBObjectStore.getAll', 1, function(evt) {
                                     IDBKeyRange.bound('g', 'm'), 3);
       req.onsuccess = t.step_func(function(evt) {
           assert_array_equals(evt.target.result, ['g', 'h', 'i']
-              .map(c => 'value-' + c));
+              .map(function(c) { return 'value-' + c; }));
           t.done();
       });
     }, 'Get bound range with maxCount');
@@ -123,7 +120,7 @@ doSetup(location.pathname + '-IDBObjectStore.getAll', 1, function(evt) {
                                     IDBKeyRange.bound('g', 'k', false, true));
       req.onsuccess = t.step_func(function(evt) {
           assert_array_equals(evt.target.result, ['g', 'h', 'i', 'j']
-              .map(c => 'value-' + c));
+              .map(function(c) { return 'value-' + c; }));
           t.done();
       });
     }, 'Get upper excluded');
@@ -133,7 +130,7 @@ doSetup(location.pathname + '-IDBObjectStore.getAll', 1, function(evt) {
                                     IDBKeyRange.bound('g', 'k', true, false));
       req.onsuccess = t.step_func(function(evt) {
           assert_array_equals(evt.target.result, ['h', 'i', 'j', 'k']
-              .map(c => 'value-' + c));
+              .map(function(c) { return 'value-' + c; }));
           t.done();
       });
     }, 'Get lower excluded');
@@ -144,8 +141,8 @@ doSetup(location.pathname + '-IDBObjectStore.getAll', 1, function(evt) {
       req.onsuccess = t.step_func(function(evt) {
           var data = evt.target.result;
           assert_true(Array.isArray(data));
-          assert_array_equals(data.map(e => e.ch), ['d', 'e', 'f']);
-          assert_array_equals(data.map(e => e.id), [4, 5, 6]);
+          assert_array_equals(data.map(function(e) { return e.ch; }), ['d', 'e', 'f']);
+          assert_array_equals(data.map(function(e) { return e.id; }), [4, 5, 6]);
           t.done();
       });
     }, 'Get bound range (generated) with maxCount');
@@ -165,10 +162,13 @@ doSetup(location.pathname + '-IDBObjectStore.getAll', 1, function(evt) {
       var req = createGetAllRequest(t, 'out-of-line', connection, undefined, 0);
       req.onsuccess = t.step_func(function(evt) {
           assert_array_equals(evt.target.result,
-              alphabet.map(c => 'value-' + c));
+              alphabet.map(function(c) { return 'value-' + c; }));
           t.done();
       });
     }, 'zero maxCount');
+
+    // Explicit done needed in case async_test body fails synchronously.
+    done();
 });
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/storage/indexeddb/objectstore-getallkeys.html b/third_party/WebKit/LayoutTests/imported/web-platform-tests/IndexedDB/idbobjectstore_getAllKeys.html
index 8ca26ea..1cff916 100644
--- a/third_party/WebKit/LayoutTests/storage/indexeddb/objectstore-getallkeys.html
+++ b/third_party/WebKit/LayoutTests/imported/web-platform-tests/IndexedDB/idbobjectstore_getAllKeys.html
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
 <title>IndexedDB: Test IDBObjectStore.getAllKeys.</title>
-<script src="../../resources/testharness.js"></script>
-<script src="../../resources/testharnessreport.js"></script>
+<script src="../../../resources/testharness.js"></script>
+<script src="../../../resources/testharnessreport.js"></script>
 <script>
+setup({explicit_done: true});
 
 var alphabet = 'abcdefghijklmnopqrstuvwxyz'.split('');
 
@@ -39,10 +40,7 @@ function doSetup(dbName, dbVersion, onsuccess) {
 function createGetAllKeysRequest(t, storeName, connection, range, maxCount) {
     var transaction = connection.transaction(storeName, 'readonly');
     var store = transaction.objectStore(storeName);
-    // TODO(cmumford): Simplify once crbug.com/335871 is closed.
-    var req = maxCount !== undefined ? store.getAllKeys(range, maxCount) :
-              range !== undefined ? store.getAllKeys(range) :
-              store.getAllKeys();
+    var req = store.getAllKeys(range, maxCount);
     req.onerror = t.unreached_func('getAllKeys request should succeed');
     return req;
 }
@@ -89,8 +87,7 @@ doSetup(location.pathname + '-IDBObjectStore.getAllKeys', 1, function(evt) {
       var req = createGetAllKeysRequest(t, 'out-of-line', connection, undefined,
                                     10);
       req.onsuccess = t.step_func(function(evt) {
-          assert_array_equals(evt.target.result,
-              ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j']);
+          assert_array_equals(evt.target.result, 'abcdefghij'.split(''));
           t.done();
       });
     }, 'Test maxCount');
@@ -99,8 +96,7 @@ doSetup(location.pathname + '-IDBObjectStore.getAllKeys', 1, function(evt) {
       var req = createGetAllKeysRequest(t, 'out-of-line', connection,
                                     IDBKeyRange.bound('g', 'm'));
       req.onsuccess = t.step_func(function(evt) {
-          assert_array_equals(evt.target.result,
-              ['g', 'h', 'i', 'j', 'k', 'l', 'm']);
+          assert_array_equals(evt.target.result, 'ghijklm'.split(''));
           t.done();
       });
     }, 'Get bound range');
@@ -163,6 +159,9 @@ doSetup(location.pathname + '-IDBObjectStore.getAllKeys', 1, function(evt) {
           t.done();
       });
     }, 'zero maxCount');
+
+    // Explicit done needed in case async_test body fails synchronously.
+    done();
 });
 
 </script>
diff --git a/third_party/WebKit/LayoutTests/imported/web-platform-tests/IndexedDB/idbtransaction_objectStoreNames.html b/third_party/WebKit/LayoutTests/imported/web-platform-tests/IndexedDB/idbtransaction_objectStoreNames.html
new file mode 100644
index 0000000..4d7c745
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/imported/web-platform-tests/IndexedDB/idbtransaction_objectStoreNames.html
@@ -0,0 +1,182 @@
+<!DOCTYPE html>
+<title>IndexedDB: IDBTransaction.objectStoreNames attribute</title>
+<script src="../../../resources/testharness.js"></script>
+<script src="../../../resources/testharnessreport.js"></script>
+<script>
+
+function indexeddb_test(upgrade_func, open_func, description) {
+    async_test(function(t) {
+        var dbname = document.location + '-' + t.name;
+        var del = indexedDB.deleteDatabase(dbname);
+        del.onerror = t.unreached_func('deleteDatabase should succeed');
+        var open = indexedDB.open(dbname, 1);
+        open.onerror = t.unreached_func('open should succeed');
+        open.onupgradeneeded = t.step_func(function() {
+            var db = open.result;
+            var tx = open.transaction;
+            upgrade_func(t, db, tx);
+        });
+        open.onsuccess = t.step_func(function() {
+            var db = open.result;
+            open_func(t, db);
+        });
+    }, description);
+}
+
+function with_stores_test(store_names, open_func, description) {
+    indexeddb_test(function(t, db, tx) {
+        store_names.forEach(function(name) {
+            db.createObjectStore(name);
+        });
+    }, open_func, description);
+}
+
+indexeddb_test(function(t, db, tx) {
+    assert_array_equals(tx.objectStoreNames, [],
+        'transaction objectStoreNames should be empty');
+    assert_array_equals(db.objectStoreNames, tx.objectStoreNames,
+        'connection and transacton objectStoreNames should match');
+
+    db.createObjectStore('s1');
+    assert_array_equals(tx.objectStoreNames, ['s1'],
+        'transaction objectStoreNames should have new store');
+    assert_array_equals(db.objectStoreNames, tx.objectStoreNames,
+        'connection and transacton objectStoreNames should match');
+
+    db.createObjectStore('s3');
+    assert_array_equals(tx.objectStoreNames, ['s1', 's3'],
+        'transaction objectStoreNames should have new store');
+    assert_array_equals(db.objectStoreNames, tx.objectStoreNames,
+        'connection and transacton objectStoreNames should match');
+
+    db.createObjectStore('s2');
+    assert_array_equals(tx.objectStoreNames, ['s1', 's2', 's3'],
+        'transaction objectStoreNames should be sorted');
+    assert_array_equals(db.objectStoreNames, tx.objectStoreNames,
+        'connection and transacton objectStoreNames should match');
+
+    db.deleteObjectStore('s1');
+    assert_array_equals(tx.objectStoreNames, ['s2', 's3'],
+        'transaction objectStoreNames should be updated after delete');
+    assert_array_equals(db.objectStoreNames, tx.objectStoreNames,
+        'connection and transacton objectStoreNames should match');
+}, function(t, db) {
+    t.done();
+}, 'IDBTransaction.objectStoreNames - during upgrade transaction');
+
+(function() {
+    var saved_tx;
+    indexeddb_test(function(t, db, tx) {
+        saved_tx = tx;
+        db.createObjectStore('s2');
+        db.createObjectStore('s3');
+    }, function(t, db) {
+        db.close();
+        var open2 = indexedDB.open(db.name, db.version + 1);
+        open2.onerror = t.unreached_func('open should succeed');
+        open2.onupgradeneeded = t.step_func(function() {
+            var db2 = open2.result;
+            var tx2 = open2.transaction;
+            assert_array_equals(tx2.objectStoreNames, ['s2', 's3'],
+                'transaction should have previous stores in scope');
+            assert_array_equals(db2.objectStoreNames, tx2.objectStoreNames,
+                'connection and transacton objectStoreNames should match');
+
+            db2.createObjectStore('s4');
+            assert_array_equals(tx2.objectStoreNames, ['s2', 's3', 's4'],
+                'transaction should have new store in scope');
+            assert_array_equals(db2.objectStoreNames, tx2.objectStoreNames,
+                'connection and transacton objectStoreNames should match');
+
+            assert_array_equals(saved_tx.objectStoreNames, ['s2', 's3'],
+                'previous transaction objectStoreNames should be unchanged');
+            assert_array_equals(db.objectStoreNames, saved_tx.objectStoreNames,
+                'connection and transaction objectStoreNames should match');
+            t.done();
+        });
+    }, 'IDBTransaction.objectStoreNames - value after close');
+}());
+
+with_stores_test(['s1', 's2'], function(t, db) {
+    assert_array_equals(db.transaction('s1').objectStoreNames, ['s1'],
+        'transaction should have one store in scope');
+    assert_array_equals(db.transaction(['s1', 's2']).objectStoreNames,
+        ['s1', 's2'],
+        'transaction should have two stores in scope');
+    t.done();
+}, 'IDBTransaction.objectStoreNames - transaction scope');
+
+with_stores_test(['s1', 's2'], function(t, db) {
+    var tx = db.transaction(['s1', 's2'], 'readwrite');
+    tx.objectStore('s1').put(0, 0);
+    tx.onabort = t.unreached_func('transaction should complete');
+    tx.oncomplete = t.step_func(function() {
+        assert_array_equals(tx.objectStoreNames, ['s1', 's2'],
+            'objectStoreNames should return scope after transaction commits');
+        t.done();
+    });
+}, 'IDBTransaction.objectStoreNames - value after commit');
+
+with_stores_test(['s1', 's2'], function(t, db) {
+    var tx = db.transaction(['s1', 's2'], 'readwrite');
+    tx.objectStore('s1').put(0, 0);
+    tx.objectStore('s1').add(0, 0);
+    tx.oncomplete = t.unreached_func('transaction should abort');
+    tx.onabort = t.step_func(function() {
+        assert_array_equals(tx.objectStoreNames, ['s1', 's2'],
+            'objectStoreNames should return scope after transaction aborts');
+        t.done();
+    });
+}, 'IDBTransaction.objectStoreNames - value after abort');
+
+with_stores_test(['s1', 's2', 's3'], function(t, db) {
+    assert_array_equals(db.transaction(['s3', 's2', 's1']).objectStoreNames,
+        ['s1', 's2', 's3'],
+        'transaction objectStoreNames should be sorted');
+    t.done();
+}, 'IDBTransaction.objectStoreNames - sorting');
+
+with_stores_test(['s1', 's2'], function(t, db) {
+    assert_array_equals(
+        db.transaction(['s2', 's1', 's2']).objectStoreNames,
+            ['s1', 's2'],
+        'transaction objectStoreNames should not have duplicates');
+    t.done();
+}, 'IDBTransaction.objectStoreNames - no duplicates');
+
+var unusual_names = [
+    '', // empty string
+
+    '\x00', // U+0000 NULL
+    '\xFF', // U+00FF LATIN SMALL LETTER Y WITH DIAERESIS
+
+    '1', // basic ASCII
+    '12', // basic ASCII
+    '123', // basic ASCII
+    'abc', // basic ASCII
+    'ABC', // basic ASCII
+
+    '\xA2', // U+00A2 CENT SIGN
+    '\u6C34', // U+6C34 CJK UNIFIED IDEOGRAPH (water)
+    '\uD834\uDD1E', // U+1D11E MUSICAL SYMBOL G-CLEF (UTF-16 surrogate pair)
+    '\uFFFD', // U+FFFD REPLACEMENT CHARACTER
+
+    '\uD800', // UTF-16 surrogate lead
+    '\uDC00', // UTF-16 surrogate trail
+];
+unusual_names.sort();
+
+indexeddb_test(function(t, db, tx) {
+    unusual_names.slice().reverse().forEach(function(name) {
+        db.createObjectStore(name);
+    });
+    assert_array_equals(tx.objectStoreNames, unusual_names,
+        'transaction should have names sorted');
+}, function(t, db) {
+    var tx = db.transaction(unusual_names.slice().reverse().concat(unusual_names));
+    assert_array_equals(tx.objectStoreNames, unusual_names,
+        'transaction should have names sorted with no duplicates');
+    t.done();
+}, 'IDBTransaction.objectStoreNames - unusual names');
+
+</script>
diff --git a/third_party/WebKit/LayoutTests/imported/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor-expected.txt b/third_party/WebKit/LayoutTests/imported/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor-expected.txt
deleted file mode 100644
index 183a6f3..0000000
--- a/third_party/WebKit/LayoutTests/imported/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-This is a testharness.js-based test.
-PASS event and htmlFor IDL attributes of HTMLScriptElement 
-FAIL event and htmlFor IDL attributes of HTMLScriptElement 1 assert_equals: expected "" but got "blah"
-FAIL event and htmlFor IDL attributes of HTMLScriptElement 2 assert_equals: expected "" but got "foo"
-FAIL event and htmlFor IDL attributes of HTMLScriptElement 3 assert_equals: expected "" but got "null"
-FAIL event and htmlFor IDL attributes of HTMLScriptElement 4 assert_equals: expected "" but got "undefined"
-Harness: the test ran to completion.
-
diff --git a/third_party/WebKit/LayoutTests/imported/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html b/third_party/WebKit/LayoutTests/imported/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html
index 65c2b9a..6631c9a 100644
--- a/third_party/WebKit/LayoutTests/imported/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html
+++ b/third_party/WebKit/LayoutTests/imported/web-platform-tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html
@@ -16,8 +16,8 @@ test(function() {
   var script = document.createElement("script");
   script.setAttribute("event", "blah");
   script.setAttribute("for", "blah");
-  assert_equals(script.event, "");
-  assert_equals(script.htmlFor, "");
+  assert_equals(script.event, "blah");
+  assert_equals(script.htmlFor, "blah");
   assert_equals(script.getAttribute("event"), "blah");
   assert_equals(script.getAttribute("for"), "blah");
 })
@@ -27,10 +27,10 @@ test(function() {
   script.setAttribute("for", "blah");
   script.event = "foo";
   script.htmlFor = "foo";
-  assert_equals(script.event, "");
-  assert_equals(script.htmlFor, "");
-  assert_equals(script.getAttribute("event"), "blah");
-  assert_equals(script.getAttribute("for"), "blah");
+  assert_equals(script.event, "foo");
+  assert_equals(script.htmlFor, "foo");
+  assert_equals(script.getAttribute("event"), "foo");
+  assert_equals(script.getAttribute("for"), "foo");
 })
 test(function() {
   var script = document.createElement("script");
@@ -38,10 +38,10 @@ test(function() {
   script.setAttribute("for", "blah");
   script.event = null;
   script.htmlFor = null;
-  assert_equals(script.event, "");
-  assert_equals(script.htmlFor, "");
-  assert_equals(script.getAttribute("event"), "blah");
-  assert_equals(script.getAttribute("for"), "blah");
+  assert_equals(script.event, "null");
+  assert_equals(script.htmlFor, "null");
+  assert_equals(script.getAttribute("event"), "null");
+  assert_equals(script.getAttribute("for"), "null");
 })
 test(function() {
   var script = document.createElement("script");
@@ -49,9 +49,9 @@ test(function() {
   script.setAttribute("for", "blah");
   script.event = undefined;
   script.htmlFor = undefined;
-  assert_equals(script.event, "");
-  assert_equals(script.htmlFor, "");
-  assert_equals(script.getAttribute("event"), "blah");
-  assert_equals(script.getAttribute("for"), "blah");
+  assert_equals(script.event, "undefined");
+  assert_equals(script.htmlFor, "undefined");
+  assert_equals(script.getAttribute("event"), "undefined");
+  assert_equals(script.getAttribute("for"), "undefined");
 })
 </script>
diff --git a/third_party/WebKit/LayoutTests/imported/web-platform-tests/html/webappapis/scripting/events/event-handler-attributes-body-window-expected.txt b/third_party/WebKit/LayoutTests/imported/web-platform-tests/html/webappapis/scripting/events/event-handler-attributes-body-window-expected.txt
new file mode 100644
index 0000000..955759a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/imported/web-platform-tests/html/webappapis/scripting/events/event-handler-attributes-body-window-expected.txt
@@ -0,0 +1,26 @@
+This is a testharness.js-based test.
+PASS HTMLBodyElement.onblur 
+PASS HTMLBodyElement.onblur 1 
+PASS HTMLBodyElement.onblur 2 
+PASS HTMLBodyElement.onblur 3 
+PASS HTMLBodyElement.onblur 4 
+PASS HTMLBodyElement.onblur 5 
+FAIL HTMLBodyElement.onblur 6 assert_equals: expected (function) function "function f() {
+  return 0;
+}" but got (undefined) undefined
+FAIL HTMLBodyElement.onblur 7 assert_equals: expected (function) function "function f() {
+  return 0;
+}" but got (undefined) undefined
+PASS HTMLBodyElement.onblur 8 
+PASS HTMLBodyElement.onblur 9 
+PASS HTMLBodyElement.onblur 10 
+PASS HTMLBodyElement.onblur 11 
+PASS HTMLBodyElement.onblur 12 
+PASS HTMLBodyElement.onblur 13 
+PASS HTMLBodyElement.onblur 14 
+PASS HTMLBodyElement.onblur 15 
+PASS HTMLBodyElement.onblur 16 
+PASS HTMLBodyElement.onblur 17 
+PASS HTMLBodyElement.onblur 18 
+Harness: the test ran to completion.
+
diff --git a/third_party/WebKit/LayoutTests/imported/web-platform-tests/html/webappapis/scripting/events/event-handler-attributes-body-window.html b/third_party/WebKit/LayoutTests/imported/web-platform-tests/html/webappapis/scripting/events/event-handler-attributes-body-window.html
new file mode 100644
index 0000000..0459049
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/imported/web-platform-tests/html/webappapis/scripting/events/event-handler-attributes-body-window.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<title>HTMLBodyElement.onblur</title>
+
+<script src="../../../../../../resources/testharness.js"></script>
+<script src="../../../../../../resources/testharnessreport.js"></script>
+<div id="log"></div>
+<body>
+<script>
+function f() {
+  return 0;
+}
+
+var handlers = ['blur','error','focus','load','resize','scroll',
+                'afterprint','beforeprint','beforeunload','hashchange',
+                'languagechange','message','offline','online','pagehide',
+                'pageshow','popstate','storage','unload'];
+handlers.forEach(function(handler) {
+  test(function() {
+    document.body['on' + handler] = f;
+    assert_equals(window['on' + handler], f);
+  });
+});
+
+</script>
\ No newline at end of file
diff --git a/third_party/WebKit/LayoutTests/storage/indexeddb/idbtransaction_objectstorenames.html b/third_party/WebKit/LayoutTests/storage/indexeddb/idbtransaction_objectstorenames.html
deleted file mode 100644
index dd149b4..0000000
--- a/third_party/WebKit/LayoutTests/storage/indexeddb/idbtransaction_objectstorenames.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html>
-<title>IndexedDB: IDBTransaction.objectStoreNames attribute</title>
-<script src="../../resources/testharness.js"></script>
-<script src="../../resources/testharnessreport.js"></script>
-<script>
-
-async_test(function(t) {
-    var dbname = document.location + '-' + t.name;
-    var del = indexedDB.deleteDatabase(dbname);
-    del.onerror = t.unreached_func('deleteDatabase should succeed');
-    var open = indexedDB.open(dbname, 1);
-    open.onerror = t.unreached_func('open should succeed');
-
-    var tx;
-    open.onupgradeneeded = t.step_func(function() {
-        var db = open.result;
-        tx = open.transaction;
-        assert_array_equals(db.objectStoreNames, [],
-            'database should have no stores');
-        assert_array_equals(tx.objectStoreNames, [],
-            'transaction objectStoreNames should be empty');
-
-        db.createObjectStore('s1');
-        assert_array_equals(db.objectStoreNames, ['s1'],
-            'database should have one store');
-        assert_array_equals(tx.objectStoreNames, ['s1'],
-            'transaction objectStoreNames should have new store');
-
-        db.createObjectStore('s3');
-        assert_array_equals(db.objectStoreNames, ['s1', 's3'],
-            'database should have two stores');
-        assert_array_equals(tx.objectStoreNames, ['s1', 's3'],
-            'transaction objectStoreNames should have new store');
-
-        db.createObjectStore('s2');
-        assert_array_equals(db.objectStoreNames, ['s1', 's2', 's3'],
-            'database should have three stores');
-        assert_array_equals(tx.objectStoreNames, ['s1', 's2', 's3'],
-            'transaction objectStoreNames should be sorted');
-
-        db.deleteObjectStore('s1');
-        assert_array_equals(db.objectStoreNames, ['s2', 's3'],
-            'database should have two stores');
-        assert_array_equals(tx.objectStoreNames, ['s2', 's3'],
-            'transaction objectStoreNames should be updated after delete');
-    });
-    open.onsuccess = t.step_func(function() {
-        var db = open.result;
-        db.close();
-
-        assert_array_equals(db.objectStoreNames, ['s2', 's3'],
-            'connection should have snapshot of store names after close');
-        assert_array_equals(tx.objectStoreNames, ['s2', 's3'],
-            'transaction should have snapshot of store names after close');
-
-        var open2 = indexedDB.open(dbname, 2);
-        open2.onerror = t.unreached_func('open should succeed');
-        open2.onupgradeneeded = t.step_func(function() {
-            var db2 = open2.result;
-            var tx2 = open2.transaction;
-            assert_array_equals(db2.objectStoreNames, ['s2', 's3'],
-                'database should have two stores');
-            assert_array_equals(tx2.objectStoreNames, ['s2', 's3'],
-                'transaction should have two stores in scope');
-
-            db2.createObjectStore('s4');
-            assert_array_equals(db2.objectStoreNames, ['s2', 's3', 's4'],
-                'database should have three stores');
-            assert_array_equals(tx2.objectStoreNames, ['s2', 's3', 's4'],
-                'transaction should have new store in scope');
-
-            assert_array_equals(db.objectStoreNames, ['s2', 's3'],
-                'previous connection objectStoreNames should be unchanged');
-            assert_array_equals(tx.objectStoreNames, ['s2', 's3'],
-                'previous transaction objectStoreNames should be unchanged');
-
-            t.done();
-        });
-    });
-
-}, 'IDBTransaction.objectStoreNames in upgrade transactions');
-
-async_test(function(t) {
-    var dbname = document.location + '-' + t.name;
-    var del = indexedDB.deleteDatabase(dbname);
-    del.onerror = t.unreached_func('deleteDatabase should succeed');
-    var open = indexedDB.open(dbname, 1);
-    open.onerror = t.unreached_func('open should succeed');
-
-    open.onupgradeneeded = t.step_func(function() {
-        var db = open.result;
-        assert_array_equals(db.objectStoreNames, [],
-            'database should have no stores');
-        db.createObjectStore('s1');
-        db.createObjectStore('s2');
-        db.createObjectStore('s3');
-        assert_array_equals(db.objectStoreNames, ['s1', 's2', 's3'],
-            'database should have three stores');
-    });
-    open.onsuccess = t.step_func(function() {
-        var db = open.result;
-        assert_array_equals(db.transaction('s1').objectStoreNames, ['s1'],
-            'transaction should have one store in scope');
-
-        assert_array_equals(db.transaction(['s1', 's2']).objectStoreNames,
-            ['s1', 's2'],
-            'transaction should have two stores in scope');
-
-        assert_array_equals(db.transaction(['s3', 's1']).objectStoreNames,
-            ['s1', 's3'],
-            'transaction objectStoreNames should be sorted');
-
-        assert_array_equals(
-            db.transaction(['s2', 's1', 's2']).objectStoreNames,
-            ['s1', 's2'],
-            'transaction objectStoreNames should not have duplicates');
-        var tx = db.transaction(['s1', 's2']);
-        tx.oncomplete = t.step_func(function() {
-            assert_array_equals(tx.objectStoreNames, ['s1', 's2'],
-                'transaction objectStoreNames should be unchanged ' +
-                    'when finished');
-            db.close();
-            t.done();
-        });
-    });
-}, 'IDBTransaction.objectStoreNames in simple transactions');
-
-async_test(function(t) {
-    var dbname = document.location + '-' + t.name;
-    var del = indexedDB.deleteDatabase(dbname);
-    del.onerror = t.unreached_func('deleteDatabase should succeed');
-    var open = indexedDB.open(dbname, 1);
-    open.onerror = t.unreached_func('open should succeed');
-
-    var names = [
-        '', // empty string
-
-        '\x00', // U+0000 NULL
-        '\xFF', // U+00FF LATIN SMALL LETTER Y WITH DIAERESIS
-
-        '1', // basic ASCII
-        '12', // basic ASCII
-        '123', // basic ASCII
-        'abc', // basic ASCII
-        'ABC', // basic ASCII
-
-        '\xA2', // U+00A2 CENT SIGN
-        '\u6C34', // U+6C34 CJK UNIFIED IDEOGRAPH (water)
-        '\uD834\uDD1E', // U+1D11E MUSICAL SYMBOL G-CLEF (UTF-16 surrogate pair)
-        '\uFFFD', // U+FFFD REPLACEMENT CHARACTER
-
-        '\uD800', // UTF-16 surrogate lead
-        '\uDC00', // UTF-16 surrogate trail
-    ];
-    names.sort();
-
-    open.onupgradeneeded = t.step_func(function() {
-        var db = open.result;
-        var tx = open.transaction;
-        assert_array_equals(db.objectStoreNames, [],
-            'database should have no stores');
-        assert_array_equals(tx.objectStoreNames, [],
-            'transaction should have no stores');
-
-        names.slice().reverse().forEach(function(name) {
-            db.createObjectStore(name);
-        });
-
-        assert_array_equals(db.objectStoreNames, names,
-            'database should have names sorted');
-        assert_array_equals(tx.objectStoreNames, names,
-            'transaction should have names sorted');
-    });
-    open.onsuccess = t.step_func(function() {
-        var db = open.result;
-        var tx = db.transaction(names.slice().reverse().concat(names));
-
-        assert_array_equals(db.objectStoreNames, names,
-            'database should have names sorted with no duplicates');
-        assert_array_equals(tx.objectStoreNames, names,
-            'transaction should have names sorted with no duplicates');
-
-        db.close();
-        t.done();
-    });
-}, 'IDBTransaction.objectStoreNames are sorted');
-
-
-</script>