[SessionStorageS13N] Fix key decoding/encoding and site isolation.

Allows namespaces to be bound multiple times for site isolation work,
fixes key encoding & decoding in the renderer, and fixes some tests.

Change-Id: Iac667af7f6edcb4774f9ef49cfc8fd0801060b31
Reviewed-on: https://chromium-review.googlesource.com/1065207
Reviewed-by: John Abd-El-Malek <[email protected]>
Reviewed-by: Marijn Kruisselbrink <[email protected]>
Commit-Queue: Daniel Murphy <[email protected]>
Cr-Commit-Position: refs/heads/master@{#560391}

Author: dmurph

webstorage/eventTestHarness.js

@@ -5,6 +5,10 @@ iframe.contentWindow.document.body.textContent = "Nothing to see here.";
 
 storageEventList = new Array();
 iframe.contentWindow.onstorage = function(e) {
+    if (iframe.contentWindow.sessionStorage === e.storageArea)
+      e.storageAreaString = "sessionStorage";
+    else if (iframe.contentWindow.localStorage === e.storageArea)
+      e.storageAreaString = "localStorage";
     window.parent.storageEventList.push(e);
 };
 

webstorage/event_basic.js

@@ -20,6 +20,8 @@ testStorages(function(storageString) {
                 assert_unreached(msg);
             }
             assert_equals(storageEventList.length, 1);
+            assert_equals(storageEventList[0].storageAreaString, storageString,
+                "Storage event came from wrong storage type.");
             assert_equals(storageEventList[0].key, "FOO");
             assert_equals(storageEventList[0].oldValue, null);
             assert_equals(storageEventList[0].newValue, "BAR");
@@ -38,18 +40,26 @@ testStorages(function(storageString) {
                 assert_unreached(msg);
             }
             assert_equals(storageEventList.length, 5);
+            assert_equals(storageEventList[1].storageAreaString, storageString,
+                "Storage event came from wrong storage type.");
             assert_equals(storageEventList[1].key, "FU");
             assert_equals(storageEventList[1].oldValue, null);
             assert_equals(storageEventList[1].newValue, "BAR");
 
+            assert_equals(storageEventList[2].storageAreaString, storageString,
+                "Storage event came from wrong storage type.");
             assert_equals(storageEventList[2].key, "a");
             assert_equals(storageEventList[2].oldValue, null);
             assert_equals(storageEventList[2].newValue, "1");
 
+            assert_equals(storageEventList[3].storageAreaString, storageString,
+                "Storage event came from wrong storage type.");
             assert_equals(storageEventList[3].key, "b");
             assert_equals(storageEventList[3].oldValue, null);
             assert_equals(storageEventList[3].newValue, "2");
 
+            assert_equals(storageEventList[4].storageAreaString, storageString,
+                "Storage event came from wrong storage type.");
             assert_equals(storageEventList[4].key, "b");
             assert_equals(storageEventList[4].oldValue, "2");
             assert_equals(storageEventList[4].newValue, "3");
@@ -65,6 +75,8 @@ testStorages(function(storageString) {
                 assert_unreached(msg);
             }
             assert_equals(storageEventList.length, 6);
+            assert_equals(storageEventList[5].storageAreaString, storageString,
+                "Storage event came from wrong storage type.");
             assert_equals(storageEventList[5].key, "FOO");
             assert_equals(storageEventList[5].oldValue, "BAR");
             assert_equals(storageEventList[5].newValue, null);
@@ -80,6 +92,8 @@ testStorages(function(storageString) {
                 assert_unreached(msg);
             }
             assert_equals(storageEventList.length, 7);
+            assert_equals(storageEventList[6].storageAreaString, storageString,
+                "Storage event came from wrong storage type.");
             assert_equals(storageEventList[6].key, "FU");
             assert_equals(storageEventList[6].oldValue, "BAR");
             assert_equals(storageEventList[6].newValue, null);
@@ -95,6 +109,8 @@ testStorages(function(storageString) {
                 assert_unreached(msg);
             }
             assert_equals(storageEventList.length, 8);
+            assert_equals(storageEventList[7].storageAreaString, storageString,
+                "Storage event came from wrong storage type.");
             assert_equals(storageEventList[7].key, null);
             assert_equals(storageEventList[7].oldValue, null);
             assert_equals(storageEventList[7].newValue, null);