From 71451b41fef8bf891c4063886e6e62cf7abdcb6f Mon Sep 17 00:00:00 2001 From: Honza Bambas Date: Wed, 27 Oct 2010 20:41:23 +0200 Subject: [PATCH] Backout bug 527667, a=orange-fix --- browser/base/content/sanitize.js | 5 - .../storage/nsIDOMStorageManager.idl | 11 +-- dom/src/storage/nsDOMStorage.cpp | 94 ++---------------- dom/src/storage/nsDOMStorage.h | 16 +-- dom/src/storage/nsDOMStorageDBWrapper.cpp | 19 ---- dom/src/storage/nsDOMStorageDBWrapper.h | 7 -- dom/src/storage/nsDOMStorageMemoryDB.cpp | 29 ------ dom/src/storage/nsDOMStorageMemoryDB.h | 9 -- dom/src/storage/nsDOMStoragePersistentDB.cpp | 97 +++---------------- dom/src/storage/nsDOMStoragePersistentDB.h | 9 -- dom/tests/mochitest/Makefile.in | 1 - dom/tests/mochitest/globalstorage/Makefile.in | 54 ----------- .../test_globalStorageDeleteSinceAPI.html | 73 -------------- dom/tests/mochitest/localstorage/Makefile.in | 2 - .../test_localStorageDeleteSinceAPI.html | 70 ------------- ...lStorageDeleteSinceAPIPrivateBrowsing.html | 85 ---------------- .../mochitest/sessionstorage/Makefile.in | 1 - .../test_sessionStorageDeleteSinceAPI.html | 67 ------------- 18 files changed, 22 insertions(+), 627 deletions(-) delete mode 100644 dom/tests/mochitest/globalstorage/Makefile.in delete mode 100644 dom/tests/mochitest/globalstorage/test_globalStorageDeleteSinceAPI.html delete mode 100644 dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPI.html delete mode 100644 dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPIPrivateBrowsing.html delete mode 100644 dom/tests/mochitest/sessionstorage/test_sessionStorageDeleteSinceAPI.html diff --git a/browser/base/content/sanitize.js b/browser/base/content/sanitize.js index 8c6d9a7dd91..3834c697e11 100644 --- a/browser/base/content/sanitize.js +++ b/browser/base/content/sanitize.js @@ -152,11 +152,6 @@ Sanitizer.prototype = { // This cookie was created after our cutoff, clear it cookieMgr.remove(cookie.host, cookie.name, cookie.path, false); } - - // Also handle all DOM storage data created after the cutoff. - var domStorageManager = Components.classes["@mozilla.org/dom/storagemanager;1"] - .getService(Ci.nsIDOMStorageManager); - domStorageManager.clearStorageDataSince(this.range[0]); } else { // Remove everything diff --git a/dom/interfaces/storage/nsIDOMStorageManager.idl b/dom/interfaces/storage/nsIDOMStorageManager.idl index 13ef2b207af..7df2efa3470 100644 --- a/dom/interfaces/storage/nsIDOMStorageManager.idl +++ b/dom/interfaces/storage/nsIDOMStorageManager.idl @@ -40,7 +40,7 @@ interface nsIDOMStorage; interface nsIPrincipal; -[scriptable, uuid(9b729267-00ed-4e5c-a3d2-b5572ca0934d)] +[scriptable, uuid(fd91ec36-7da8-43bb-b8f2-4b57a862a467)] interface nsIDOMStorageManager : nsISupports { /** @@ -59,15 +59,6 @@ interface nsIDOMStorageManager : nsISupports */ void clearOfflineApps(); - /** - * Clears any data stored in DOM storage since the provided time - * @param since - * Any storage value that has been inserted after the time specified - * with 'since' will be deleted. The time is in microseconds, defined - * as PR_Now() function result. - */ - void clearStorageDataSince(in PRInt64 since); - /** * Returns instance of localStorage object for aURI's origin. * This method ensures there is always only a single instance diff --git a/dom/src/storage/nsDOMStorage.cpp b/dom/src/storage/nsDOMStorage.cpp index e443970f1a0..acd3bfc1e24 100644 --- a/dom/src/storage/nsDOMStorage.cpp +++ b/dom/src/storage/nsDOMStorage.cpp @@ -65,7 +65,6 @@ #include "nsDOMString.h" #include "nsNetCID.h" #include "nsIProxyObjectManager.h" -#include "nsISupportsPrimitives.h" static const PRUint32 ASK_BEFORE_ACCEPT = 1; static const PRUint32 ACCEPT_SESSION = 2; @@ -403,13 +402,10 @@ nsDOMStorageManager::Observe(nsISupports *aSubject, PRUint32 cap = 0; perm->GetCapability(&cap); - if (!(cap & nsICookiePermission::ACCESS_SESSION)) + if (!(cap & nsICookiePermission::ACCESS_SESSION) || + nsDependentString(aData) != NS_LITERAL_STRING("deleted")) return NS_OK; - // In any change to ACCESS_SESSION, like add or delete, drop the session - // only storage in-memory database. This ensures that it will always be - // newly created and therefor preloaded with data from the persistent - // database after we switched to ACCESS_SESSION. nsCAutoString host; perm->GetHost(host); if (host.IsEmpty()) @@ -442,33 +438,6 @@ nsDOMStorageManager::GetUsage(const nsAString& aDomain, PR_FALSE, aUsage); } -NS_IMETHODIMP -nsDOMStorageManager::ClearStorageDataSince(PRInt64 aSince) -{ - nsresult rv; - - rv = nsDOMStorage::InitDB(); - NS_ENSURE_SUCCESS(rv, rv); - - rv = nsDOMStorage::gStorageDB->RemoveTimeRange(aSince); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr obsserv = mozilla::services::GetObserverService(); - if (obsserv) { - nsCOMPtr time = do_CreateInstance( - "@mozilla.org/supports-PRTime;1", &rv); - NS_ENSURE_SUCCESS(rv, rv); - - rv = time->SetData(aSince); - NS_ENSURE_SUCCESS(rv, rv); - - rv = obsserv->NotifyObservers(time, NS_DOMSTORAGE_CUTOFF_OBSERVER, nsnull); - NS_ENSURE_SUCCESS(rv, rv); - } - - return NS_OK; -} - NS_IMETHODIMP nsDOMStorageManager::ClearOfflineApps() { @@ -691,8 +660,6 @@ nsDOMStorage::InitAsSessionStorage(nsIPrincipal *aPrincipal, const nsSubstring & mQuotaDomainDBKey.Truncate(); #endif - RegisterObservers(false); - mStorageType = SessionStorage; return NS_OK; } @@ -736,7 +703,7 @@ nsDOMStorage::InitAsLocalStorage(nsIPrincipal *aPrincipal, const nsSubstring &aD mCanUseChromePersist = URICanUseChromePersist(URI); } - RegisterObservers(true); + RegisterObservers(); return NS_OK; } @@ -764,7 +731,7 @@ nsDOMStorage::InitAsGlobalStorage(const nsACString &aDomainDemanded) mStorageType = GlobalStorage; mEventBroadcaster = this; - RegisterObservers(true); + RegisterObservers(); return NS_OK; } @@ -1124,12 +1091,6 @@ nsDOMStorage::SetItem(const nsAString& aKey, const nsAString& aData) entry->mItem = newitem; } - if (!UseDB()) { - // This is used only for sessionStorage, no need to setup the time also when - // loading items from the database etc. - entry->mItem->SetInsertTimeToNow(); - } - if ((oldValue != aData || mStorageType == GlobalStorage) && mEventBroadcaster) mEventBroadcaster->BroadcastChangeNotification(aKey, oldValue, aData); @@ -1571,16 +1532,13 @@ nsDOMStorage::MaybeCommitTemporaryTable(bool force) } nsresult -nsDOMStorage::RegisterObservers(bool persistent) +nsDOMStorage::RegisterObservers() { nsCOMPtr obsserv = mozilla::services::GetObserverService(); if (obsserv) { - if (persistent) { - obsserv->AddObserver(this, "profile-before-change", PR_TRUE); - obsserv->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE); - obsserv->AddObserver(this, NS_DOMSTORAGE_FLUSH_TIMER_OBSERVER, PR_TRUE); - } - obsserv->AddObserver(this, NS_DOMSTORAGE_CUTOFF_OBSERVER, PR_TRUE); + obsserv->AddObserver(this, "profile-before-change", PR_TRUE); + obsserv->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE); + obsserv->AddObserver(this, NS_DOMSTORAGE_FLUSH_TIMER_OBSERVER, PR_TRUE); } return NS_OK; } @@ -1603,17 +1561,6 @@ nsDOMStorage::SetTemporaryTableLoaded(bool loaded) mLoadedTemporaryTable = loaded; } -static PLDHashOperator -StorageCutOffEnum(nsSessionStorageEntry* aEntry, void* userArg) -{ - PRInt64 since = *(PRInt64*)userArg; - - if (aEntry->mItem->ShouldBeCutOff(since)) - return PL_DHASH_REMOVE; - - return PL_DHASH_NEXT; -} - NS_IMETHODIMP nsDOMStorage::Observe(nsISupports *subject, const char *topic, @@ -1632,30 +1579,6 @@ nsDOMStorage::Observe(nsISupports *subject, return NS_OK; } - if (!strcmp(topic, NS_DOMSTORAGE_CUTOFF_OBSERVER)) { - if (UseDB()) { - // If this storage is using the database (localStorage, globalStorage) - // then just re-cache the items from the database, database is now up to - // date. - mItemsCached = PR_FALSE; - CacheKeysFromDB(); - } - else { - // This is sessionStorage. In that case we need to prune the mItems hash - // table. Insert times are properly set in nsDOMStorage::SetItem. - nsresult rv; - nsCOMPtr time = do_QueryInterface(subject, &rv); - NS_ENSURE_SUCCESS(rv, rv); - - PRInt64 since; - rv = time->GetData(&since); - NS_ENSURE_SUCCESS(rv, rv); - - mItems.EnumerateEntries(StorageCutOffEnum, &since); - } - return NS_OK; - } - NS_WARNING("Unrecognized topic in nsDOMStorage::Observe"); return NS_OK; } @@ -2108,7 +2031,6 @@ nsDOMStorageItem::nsDOMStorageItem(nsDOMStorage* aStorage, : mSecure(aSecure), mKey(aKey), mValue(aValue), - mInsertTime(0), mStorage(aStorage) { } diff --git a/dom/src/storage/nsDOMStorage.h b/dom/src/storage/nsDOMStorage.h index d8cbab687f0..4aad4f6c428 100644 --- a/dom/src/storage/nsDOMStorage.h +++ b/dom/src/storage/nsDOMStorage.h @@ -64,7 +64,6 @@ #include "mozilla/TimeStamp.h" #define NS_DOMSTORAGE_FLUSH_TIMER_OBSERVER "domstorage-flush-timer" -#define NS_DOMSTORAGE_CUTOFF_OBSERVER "domstorage-cutoff" #ifdef MOZ_STORAGE #include "nsDOMStorageDBWrapper.h" @@ -243,7 +242,7 @@ public: return static_cast(static_cast(aSupports)); } - nsresult RegisterObservers(bool persistent); + nsresult RegisterObservers(); nsresult MaybeCommitTemporaryTable(bool force); bool WasTemporaryTableLoaded(); @@ -465,16 +464,6 @@ public: mValue.Truncate(); } - void SetInsertTimeToNow() - { - mInsertTime = PR_Now(); - } - - bool ShouldBeCutOff(PRInt64 since) - { - return mInsertTime > since; - } - protected: // true if this value is for secure sites only @@ -486,9 +475,6 @@ protected: // value of the item nsString mValue; - // insertion/update time - PRInt64 mInsertTime; - // If this item came from the db, mStorage points to the storage // object where this item came from. nsRefPtr mStorage; diff --git a/dom/src/storage/nsDOMStorageDBWrapper.cpp b/dom/src/storage/nsDOMStorageDBWrapper.cpp index 28cbe1b8180..80679f25091 100644 --- a/dom/src/storage/nsDOMStorageDBWrapper.cpp +++ b/dom/src/storage/nsDOMStorageDBWrapper.cpp @@ -263,25 +263,6 @@ nsDOMStorageDBWrapper::RemoveOwner(const nsACString& aOwner, return rv; } -nsresult -nsDOMStorageDBWrapper::RemoveTimeRange(PRInt64 aSince) -{ - nsresult rv; - - rv = mPrivateBrowsingDB.RemoveTimeRange(aSince); - NS_ENSURE_SUCCESS(rv, rv); - - if (nsDOMStorageManager::gStorageManager->InPrivateBrowsingMode()) - return NS_OK; - - rv = mSessionOnlyDB.RemoveTimeRange(aSince); - NS_ENSURE_SUCCESS(rv, rv); - - rv = mPersistentDB.RemoveTimeRange(aSince); - NS_ENSURE_SUCCESS(rv, rv); - - return rv; -} nsresult nsDOMStorageDBWrapper::RemoveOwners(const nsTArray &aOwners, diff --git a/dom/src/storage/nsDOMStorageDBWrapper.h b/dom/src/storage/nsDOMStorageDBWrapper.h index bb7a4bf6ff8..ee641454c86 100644 --- a/dom/src/storage/nsDOMStorageDBWrapper.h +++ b/dom/src/storage/nsDOMStorageDBWrapper.h @@ -177,13 +177,6 @@ public: RemoveOwners(const nsTArray& aOwners, PRBool aIncludeSubDomains, PRBool aMatch); - /** - * Removes all keys that were created after the time specified by 'aSince'. - * 'aSince' value is compatible with PR_Now() function. - */ - nsresult - RemoveTimeRange(PRInt64 aSince); - /** * Removes all keys from storage. Used when clearing storage. */ diff --git a/dom/src/storage/nsDOMStorageMemoryDB.cpp b/dom/src/storage/nsDOMStorageMemoryDB.cpp index 5cbed5bb23a..220ba527f2a 100644 --- a/dom/src/storage/nsDOMStorageMemoryDB.cpp +++ b/dom/src/storage/nsDOMStorageMemoryDB.cpp @@ -230,7 +230,6 @@ nsDOMStorageMemoryDB::SetKey(nsDOMStorage* aStorage, item->mValue = aValue; item->mSecure = aSecure; - item->mInsertTime = PR_Now(); *aNewUsage = usage; @@ -380,34 +379,6 @@ nsDOMStorageMemoryDB::RemoveOwners(const nsTArray &aOwners, return NS_OK; } -static PLDHashOperator -RemoveTimeRangeEnum(const nsAString& keyname, - nsAutoPtr& item, - void *closure) -{ - if (item->mInsertTime > *(PRInt64*)closure) - return PL_DHASH_REMOVE; - - return PL_DHASH_NEXT; -} - -static PLDHashOperator -RemoveTimeRangeStoragesEnum(const nsACString& key, - nsAutoPtr& storage, - void *closure) -{ - storage->mTable.Enumerate(RemoveTimeRangeEnum, closure); - return PL_DHASH_NEXT; -} - -nsresult -nsDOMStorageMemoryDB::RemoveTimeRange(PRInt64 since) -{ - mData.Enumerate(RemoveTimeRangeStoragesEnum, &since); - - return NS_OK; -} - nsresult nsDOMStorageMemoryDB::RemoveAll() { diff --git a/dom/src/storage/nsDOMStorageMemoryDB.h b/dom/src/storage/nsDOMStorageMemoryDB.h index 2f0f7fd6140..c88fd38fb20 100644 --- a/dom/src/storage/nsDOMStorageMemoryDB.h +++ b/dom/src/storage/nsDOMStorageMemoryDB.h @@ -56,7 +56,6 @@ public: public: PRBool mSecure; nsString mValue; - PRInt64 mInsertTime; }; typedef nsClassHashtable nsStorageItemsTable; @@ -160,14 +159,6 @@ public: RemoveOwners(const nsTArray& aOwners, PRBool aIncludeSubDomains, PRBool aMatch); - /** - * Remove all values from all scopes not marked as offline that has been - * created after the time specified with 'aSince'. Used by the Clear Private - * Data dialog. 'aSince' value is compatible with PR_Now() function. - */ - nsresult - RemoveTimeRange(PRInt64 aSince); - /** * Removes all keys from storage. Used when clearing storage. */ diff --git a/dom/src/storage/nsDOMStoragePersistentDB.cpp b/dom/src/storage/nsDOMStoragePersistentDB.cpp index ae89d27e93e..0de77b00a95 100644 --- a/dom/src/storage/nsDOMStoragePersistentDB.cpp +++ b/dom/src/storage/nsDOMStoragePersistentDB.cpp @@ -205,63 +205,30 @@ nsDOMStoragePersistentDB::Init(const nsString& aDatabaseName) "PRAGMA temp_store = MEMORY")); NS_ENSURE_SUCCESS(rv, rv); - PRInt32 schemaVersion; - rv = mConnection->GetSchemaVersion(&schemaVersion); - NS_ENSURE_SUCCESS(rv, rv); - mozStorageTransaction transaction(mConnection, PR_FALSE); // Ensure Gecko 1.9.1 storage table - PRBool exists; - - rv = mConnection->TableExists(NS_LITERAL_CSTRING("webappsstore2"), - &exists); + rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING( + "CREATE TABLE IF NOT EXISTS webappsstore2 (" + "scope TEXT, " + "key TEXT, " + "value TEXT, " + "secure INTEGER, " + "owner TEXT)")); NS_ENSURE_SUCCESS(rv, rv); - if (!exists) { - rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING( - "CREATE TABLE webappsstore2 (" - "scope TEXT, " - "key TEXT, " - "value TEXT, " - "secure INTEGER, " - "owner TEXT, " - "inserttime BIGINT DEFAULT 0)")); - NS_ENSURE_SUCCESS(rv, rv); - } - else { - if (schemaVersion == 0) { - rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING( - "ALTER TABLE webappsstore2 " - "ADD COLUMN inserttime BIGINT DEFAULT 0")); - NS_ENSURE_SUCCESS(rv, rv); - } - } - - if (schemaVersion == 0) { - rv = mConnection->SetSchemaVersion(1); - NS_ENSURE_SUCCESS(rv, rv); - } - rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING( "CREATE UNIQUE INDEX IF NOT EXISTS scope_key_index" " ON webappsstore2(scope, key)")); NS_ENSURE_SUCCESS(rv, rv); - rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING( - "CREATE INDEX IF NOT EXISTS inserttime_index" - " ON webappsstore2(inserttime)")); - NS_ENSURE_SUCCESS(rv, rv); - - rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING( "CREATE TEMPORARY TABLE webappsstore2_temp (" "scope TEXT, " "key TEXT, " "value TEXT, " "secure INTEGER, " - "owner TEXT, " - "inserttime BIGINT DEFAULT 0)")); + "owner TEXT)")); NS_ENSURE_SUCCESS(rv, rv); rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING( @@ -269,11 +236,6 @@ nsDOMStoragePersistentDB::Init(const nsString& aDatabaseName) " ON webappsstore2_temp(scope, key)")); NS_ENSURE_SUCCESS(rv, rv); - rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING( - "CREATE INDEX IF NOT EXISTS inserttime_index_temp" - " ON webappsstore2_temp(inserttime)")); - NS_ENSURE_SUCCESS(rv, rv); - rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING( "CREATE TEMPORARY VIEW webappsstore2_view AS " @@ -309,6 +271,8 @@ nsDOMStoragePersistentDB::Init(const nsString& aDatabaseName) rv = mConnection->CreateFunction(NS_LITERAL_CSTRING("ISOFFLINE"), 1, function2); NS_ENSURE_SUCCESS(rv, rv); + PRBool exists; + // Check if there is storage of Gecko 1.9.0 and if so, upgrade that storage // to actual webappsstore2 table and drop the obsolete table. First process // this newer table upgrade to priority potential duplicates from older @@ -391,8 +355,8 @@ nsDOMStoragePersistentDB::Init(const nsString& aDatabaseName) // insert a new key rv = mConnection->CreateStatement(NS_LITERAL_CSTRING( "INSERT OR REPLACE INTO " - "webappsstore2_temp(scope, key, value, secure, inserttime) " - "VALUES (:scope, :key, :value, :secure, :inserttime)"), + "webappsstore2_temp(scope, key, value, secure) " + "VALUES (:scope, :key, :value, :secure)"), getter_AddRefs(mInsertKeyStatement)); NS_ENSURE_SUCCESS(rv, rv); @@ -427,14 +391,6 @@ nsDOMStoragePersistentDB::Init(const nsString& aDatabaseName) getter_AddRefs(mRemoveStorageStatement)); NS_ENSURE_SUCCESS(rv, rv); - // remove keys that are junger then a specific time - rv = mConnection->CreateStatement(NS_LITERAL_CSTRING( - "DELETE FROM webappsstore2_view " - "WHERE inserttime > :time " - "AND NOT ISOFFLINE(scope)"), - getter_AddRefs(mRemoveTimeRangeStatement)); - NS_ENSURE_SUCCESS(rv, rv); - // remove all keys rv = mConnection->CreateStatement(NS_LITERAL_CSTRING( "DELETE FROM webappsstore2_view"), @@ -733,9 +689,6 @@ nsDOMStoragePersistentDB::SetKey(nsDOMStorage* aStorage, rv = binder->BindInt32ByName(NS_LITERAL_CSTRING("secure"), aSecure ? 1 : 0); NS_ENSURE_SUCCESS(rv, rv); - rv = binder->BindInt64ByName(NS_LITERAL_CSTRING("inserttime"), - PR_Now()); - NS_ENSURE_SUCCESS(rv, rv); rv = binder.Add(); NS_ENSURE_SUCCESS(rv, rv); @@ -852,32 +805,6 @@ nsDOMStoragePersistentDB::ClearStorage(nsDOMStorage* aStorage) return NS_OK; } -nsresult -nsDOMStoragePersistentDB::RemoveTimeRange(PRInt64 since) -{ - nsresult rv; - - rv = MaybeCommitInsertTransaction(); - NS_ENSURE_SUCCESS(rv, rv); - - mozStorageStatementScoper scope(mRemoveTimeRangeStatement); - - Binder binder(mRemoveTimeRangeStatement, &rv); - NS_ENSURE_SUCCESS(rv, rv); - - rv = binder->BindInt64ByName(NS_LITERAL_CSTRING("time"), - since); - NS_ENSURE_SUCCESS(rv, rv); - - rv = binder.Add(); - NS_ENSURE_SUCCESS(rv, rv); - - rv = mRemoveTimeRangeStatement->Execute(); - NS_ENSURE_SUCCESS(rv, rv); - - return NS_OK; -} - nsresult nsDOMStoragePersistentDB::RemoveOwner(const nsACString& aOwner, PRBool aIncludeSubDomains) diff --git a/dom/src/storage/nsDOMStoragePersistentDB.h b/dom/src/storage/nsDOMStoragePersistentDB.h index b0034cfde9d..af7cfe6a308 100644 --- a/dom/src/storage/nsDOMStoragePersistentDB.h +++ b/dom/src/storage/nsDOMStoragePersistentDB.h @@ -128,14 +128,6 @@ public: RemoveOwners(const nsTArray& aOwners, PRBool aIncludeSubDomains, PRBool aMatch); - /** - * Remove all values from all scopes not marked as offline that has been - * created after the time specified with 'aSince'. Used by the Clear Private - * Data dialog. 'aSince' value is compatible with PR_Now() function. - */ - nsresult - RemoveTimeRange(PRInt64 aSince); - /** * Removes all keys from storage. Used when clearing storage. */ @@ -184,7 +176,6 @@ protected: nsCOMPtr mRemoveKeyStatement; nsCOMPtr mRemoveOwnerStatement; nsCOMPtr mRemoveStorageStatement; - nsCOMPtr mRemoveTimeRangeStatement; nsCOMPtr mRemoveAllStatement; nsCOMPtr mGetOfflineExcludedUsageStatement; nsCOMPtr mGetFullUsageStatement; diff --git a/dom/tests/mochitest/Makefile.in b/dom/tests/mochitest/Makefile.in index 93b078be639..d13e7c90ce9 100644 --- a/dom/tests/mochitest/Makefile.in +++ b/dom/tests/mochitest/Makefile.in @@ -54,7 +54,6 @@ DIRS += \ whatwg \ geolocation \ localstorage \ - globalstorage \ sessionstorage \ storageevent \ $(NULL) diff --git a/dom/tests/mochitest/globalstorage/Makefile.in b/dom/tests/mochitest/globalstorage/Makefile.in deleted file mode 100644 index 06492a9e158..00000000000 --- a/dom/tests/mochitest/globalstorage/Makefile.in +++ /dev/null @@ -1,54 +0,0 @@ -# -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is -# Mozilla Corporation. -# Portions created by the Initial Developer are Copyright (C) 2008 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Jan Bambas -# -# Alternatively, the contents of this file may be used under the terms of -# either of the GNU General Public License Version 2 or later (the "GPL"), -# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -DEPTH = ../../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = dom/tests/mochitest/globalstorage - -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk - -_TEST_FILES = \ - test_globalStorageDeleteSinceAPI.html \ - $(NULL) - -libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/globalstorage/test_globalStorageDeleteSinceAPI.html b/dom/tests/mochitest/globalstorage/test_globalStorageDeleteSinceAPI.html deleted file mode 100644 index 9c22bf4c587..00000000000 --- a/dom/tests/mochitest/globalstorage/test_globalStorageDeleteSinceAPI.html +++ /dev/null @@ -1,73 +0,0 @@ - - -globalStorage delete since API test - - - - - - - - - - - - - diff --git a/dom/tests/mochitest/localstorage/Makefile.in b/dom/tests/mochitest/localstorage/Makefile.in index 1572d88eeaa..d6f8499345c 100644 --- a/dom/tests/mochitest/localstorage/Makefile.in +++ b/dom/tests/mochitest/localstorage/Makefile.in @@ -68,8 +68,6 @@ _TEST_FILES = \ test_localStorageBase.html \ test_localStorageBasePrivateBrowsing.html \ test_localStorageBaseSessionOnly.html \ - test_localStorageDeleteSinceAPI.html \ - test_localStorageDeleteSinceAPIPrivateBrowsing.html \ test_localStorageCookieSettings.html \ test_localStorageEnablePref.html \ test_localStorageOriginsEquals.html \ diff --git a/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPI.html b/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPI.html deleted file mode 100644 index e40bb9d91eb..00000000000 --- a/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPI.html +++ /dev/null @@ -1,70 +0,0 @@ - - -localStorage delete since API test - - - - - - - - - - - - - diff --git a/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPIPrivateBrowsing.html b/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPIPrivateBrowsing.html deleted file mode 100644 index f470c3de739..00000000000 --- a/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPIPrivateBrowsing.html +++ /dev/null @@ -1,85 +0,0 @@ - - -localStorage delete since API test in Private Browsing - - - - - - - - - - - - - - diff --git a/dom/tests/mochitest/sessionstorage/Makefile.in b/dom/tests/mochitest/sessionstorage/Makefile.in index 8c40ca95a1d..3036cbb703d 100644 --- a/dom/tests/mochitest/sessionstorage/Makefile.in +++ b/dom/tests/mochitest/sessionstorage/Makefile.in @@ -53,7 +53,6 @@ _TEST_FILES = \ file_https.html \ test_sessionStorageBase.html \ test_sessionStorageClone.html \ - test_sessionStorageDeleteSinceAPI.html \ test_sessionStorageReplace.html \ test_sessionStorageHttpHttps.html \ interOriginSlave.js \ diff --git a/dom/tests/mochitest/sessionstorage/test_sessionStorageDeleteSinceAPI.html b/dom/tests/mochitest/sessionstorage/test_sessionStorageDeleteSinceAPI.html deleted file mode 100644 index ce47c62b396..00000000000 --- a/dom/tests/mochitest/sessionstorage/test_sessionStorageDeleteSinceAPI.html +++ /dev/null @@ -1,67 +0,0 @@ - - -sessionStorage delete since API test - - - - - - - - - - - - -