From d06194330da2bb8da887d2e1adeacb3a5c1504b2 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 5 Jan 2011 12:15:11 +0000 Subject: Merge WebKit at r72805: Initial merge by Git Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790 --- .../localstorage/private-browsing-affects-storage-expected.txt | 8 ++++---- .../sessionstorage/private-browsing-affects-storage-expected.txt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'LayoutTests/storage') diff --git a/LayoutTests/storage/domstorage/localstorage/private-browsing-affects-storage-expected.txt b/LayoutTests/storage/domstorage/localstorage/private-browsing-affects-storage-expected.txt index 2fea061..6de4296 100644 --- a/LayoutTests/storage/domstorage/localstorage/private-browsing-affects-storage-expected.txt +++ b/LayoutTests/storage/domstorage/localstorage/private-browsing-affects-storage-expected.txt @@ -1,7 +1,7 @@ This is a test to make sure that when private browsing is on any attempt to change the localStorage area fail. -Initial value of testItem is: null +Initial value of testItem is: InitialValue Caught exception trying to change item: Error: QUOTA_EXCEEDED_ERR: DOM Exception 22 -After change attempt, testItem is: null -After remove attempt, testItem is: null -After clear attempt, testItem is: null +After change attempt, testItem is: InitialValue +After remove attempt, testItem is: InitialValue +After clear attempt, testItem is: InitialValue diff --git a/LayoutTests/storage/domstorage/sessionstorage/private-browsing-affects-storage-expected.txt b/LayoutTests/storage/domstorage/sessionstorage/private-browsing-affects-storage-expected.txt index 58c99f2..ed2017a 100644 --- a/LayoutTests/storage/domstorage/sessionstorage/private-browsing-affects-storage-expected.txt +++ b/LayoutTests/storage/domstorage/sessionstorage/private-browsing-affects-storage-expected.txt @@ -1,7 +1,7 @@ This is a test to make sure that when private browsing is on any attempt to change the sessionStorage area fail. -Initial value of testItem is: null +Initial value of testItem is: InitialValue Caught exception trying to change item: Error: QUOTA_EXCEEDED_ERR: DOM Exception 22 -After change attempt, testItem is: null -After remove attempt, testItem is: null -After clear attempt, testItem is: null +After change attempt, testItem is: InitialValue +After remove attempt, testItem is: InitialValue +After clear attempt, testItem is: InitialValue -- cgit v1.1