From 3ab011f0e6e4cf89ba49c9f275dc21f809136a7a Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Mon, 28 May 2012 00:53:57 -0700
Subject: [PATCH] Back out Bug 754142.

---
 dom/indexedDB/IDBFactory.cpp             |  6 +-----
 dom/indexedDB/IndexedDatabase.h          |  5 -----
 dom/indexedDB/IndexedDatabaseManager.cpp | 21 ++++++++-------------
 dom/indexedDB/IndexedDatabaseManager.h   |  1 -
 dom/indexedDB/OpenDatabaseHelper.cpp     |  1 -
 dom/indexedDB/OpenDatabaseHelper.h       |  7 ++-----
 6 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/dom/indexedDB/IDBFactory.cpp b/dom/indexedDB/IDBFactory.cpp
index 26e61d8c6027..cdae0648c171 100644
--- a/dom/indexedDB/IDBFactory.cpp
+++ b/dom/indexedDB/IDBFactory.cpp
@@ -394,15 +394,12 @@ IDBFactory::OpenCommon(const nsAString& aName,
   nsCOMPtr<nsPIDOMWindow> window;
   nsCOMPtr<nsIScriptGlobalObject> sgo;
   JSObject* scriptOwner = nsnull;
-  FactoryPrivilege privilege;
 
   if (mWindow) {
     window = mWindow;
-    privilege = Content;
   }
   else {
     scriptOwner = mOwningObject;
-    privilege = Chrome;
   }
 
   nsCString origin;
@@ -415,8 +412,7 @@ IDBFactory::OpenCommon(const nsAString& aName,
   NS_ENSURE_TRUE(request, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
 
   nsRefPtr<OpenDatabaseHelper> openHelper =
-    new OpenDatabaseHelper(request, aName, origin, aVersion, aDeleting,
-                           privilege);
+    new OpenDatabaseHelper(request, aName, origin, aVersion, aDeleting);
 
   rv = openHelper->Init();
   NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
diff --git a/dom/indexedDB/IndexedDatabase.h b/dom/indexedDB/IndexedDatabase.h
index 158572e62767..743e7da4acca 100644
--- a/dom/indexedDB/IndexedDatabase.h
+++ b/dom/indexedDB/IndexedDatabase.h
@@ -32,11 +32,6 @@ BEGIN_INDEXEDDB_NAMESPACE
 
 class FileInfo;
 
-enum FactoryPrivilege {
-  Content,
-  Chrome
-};
-
 struct StructuredCloneReadInfo {
   void Swap(StructuredCloneReadInfo& aCloneReadInfo) {
     mCloneBuffer.swap(aCloneReadInfo.mCloneBuffer);
diff --git a/dom/indexedDB/IndexedDatabaseManager.cpp b/dom/indexedDB/IndexedDatabaseManager.cpp
index 93b0a2631162..0aa6e06e1e5f 100644
--- a/dom/indexedDB/IndexedDatabaseManager.cpp
+++ b/dom/indexedDB/IndexedDatabaseManager.cpp
@@ -623,7 +623,6 @@ IndexedDatabaseManager::GetIndexedDBQuotaMB()
 
 nsresult
 IndexedDatabaseManager::EnsureOriginIsInitialized(const nsACString& aOrigin,
-                                                  FactoryPrivilege mPrivilege,
                                                   nsIFile** aDirectory)
 {
 #ifdef DEBUG
@@ -671,17 +670,15 @@ IndexedDatabaseManager::EnsureOriginIsInitialized(const nsACString& aOrigin,
   rv = patternFile->GetNativePath(pattern);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // Now tell SQLite to start tracking this pattern for content.
+  // Now tell SQLite to start tracking this pattern.
   nsCOMPtr<mozIStorageServiceQuotaManagement> ss =
-      do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID);
+    do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID);
   NS_ENSURE_TRUE(ss, NS_ERROR_FAILURE);
 
-  if (mPrivilege != Chrome) {
-    rv = ss->SetQuotaForFilenamePattern(pattern,
-                                        GetIndexedDBQuotaMB() * 1024 * 1024,
-                                        mQuotaCallbackSingleton, nsnull);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
+  rv = ss->SetQuotaForFilenamePattern(pattern,
+                                      GetIndexedDBQuotaMB() * 1024 * 1024,
+                                      mQuotaCallbackSingleton, nsnull);
+  NS_ENSURE_SUCCESS(rv, rv);
 
   // We need to see if there are any files in the directory already. If they
   // are database files then we need to create file managers for them and also
@@ -769,10 +766,8 @@ IndexedDatabaseManager::EnsureOriginIsInitialized(const nsACString& aOrigin,
 
     fileManagers->AppendElement(fileManager);
 
-    if (mPrivilege != Chrome) {
-      rv = ss->UpdateQuotaInformationForFile(file);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
+    rv = ss->UpdateQuotaInformationForFile(file);
+    NS_ENSURE_SUCCESS(rv, rv);
 
     validSubdirs.PutEntry(dbBaseFilename);
   }
diff --git a/dom/indexedDB/IndexedDatabaseManager.h b/dom/indexedDB/IndexedDatabaseManager.h
index c2bd01bd3dec..d0b7c8582b46 100644
--- a/dom/indexedDB/IndexedDatabaseManager.h
+++ b/dom/indexedDB/IndexedDatabaseManager.h
@@ -120,7 +120,6 @@ public:
   GetIndexedDBQuotaMB();
 
   nsresult EnsureOriginIsInitialized(const nsACString& aOrigin,
-                                     FactoryPrivilege aPrivilege,
                                      nsIFile** aDirectory);
 
   // Determine if the quota is lifted for the Window the current thread is
diff --git a/dom/indexedDB/OpenDatabaseHelper.cpp b/dom/indexedDB/OpenDatabaseHelper.cpp
index f57823c4769d..1deb14ef9294 100644
--- a/dom/indexedDB/OpenDatabaseHelper.cpp
+++ b/dom/indexedDB/OpenDatabaseHelper.cpp
@@ -1589,7 +1589,6 @@ OpenDatabaseHelper::DoDatabaseWork()
   NS_ASSERTION(mgr, "This should never be null!");
 
   nsresult rv = mgr->EnsureOriginIsInitialized(mASCIIOrigin,
-                                               mPrivilege,
                                                getter_AddRefs(dbDirectory));
   NS_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
 
diff --git a/dom/indexedDB/OpenDatabaseHelper.h b/dom/indexedDB/OpenDatabaseHelper.h
index 0dd8bde83d2c..22e82e82af2f 100644
--- a/dom/indexedDB/OpenDatabaseHelper.h
+++ b/dom/indexedDB/OpenDatabaseHelper.h
@@ -23,12 +23,10 @@ public:
                      const nsAString& aName,
                      const nsACString& aASCIIOrigin,
                      PRUint64 aRequestedVersion,
-                     bool aForDeletion,
-                     FactoryPrivilege aPrivilege)
+                     bool aForDeletion)
     : HelperBase(aRequest), mOpenDBRequest(aRequest), mName(aName),
       mASCIIOrigin(aASCIIOrigin), mRequestedVersion(aRequestedVersion),
-      mForDeletion(aForDeletion), mPrivilege(aPrivilege),
-      mDatabaseId(nsnull), mCurrentVersion(0),
+      mForDeletion(aForDeletion), mDatabaseId(nsnull), mCurrentVersion(0),
       mLastObjectStoreId(0), mLastIndexId(0), mState(eCreated),
       mResultCode(NS_OK), mLoadDBMetadata(false)
   {
@@ -97,7 +95,6 @@ private:
   nsCString mASCIIOrigin;
   PRUint64 mRequestedVersion;
   bool mForDeletion;
-  FactoryPrivilege mPrivilege;
   nsCOMPtr<nsIAtom> mDatabaseId;
 
   // Out-params.