Remove --unlimited-quota-for-indexeddb. Increase incognito quota.

content/browser/in_process_webkit/indexed_db_dispatcher_host.cc

Index: content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
index bf1481331e53d51655a4779d46d60ed335ded2d3..0968c7173528a782d80b5a46cdf0ac971371bd11 100644
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
@@ -46,9 +46,8 @@ using WebKit::WebVector;
 
 namespace {
 
-// FIXME: Replace this magic constant once we have a more sophisticated quota
-// system.
-static const uint64 kDefaultQuota = 5 * 1024 * 1024;
+// FIXME: Delete this magic constant once we've removed sqlite.
+static const uint64 kDefaultQuota = 50 * 1024 * 1024;

[michaeln, 2011/08/25 18:23:17]

I wonder about the name of this variable? It only affects the sqlite backend
which is only used in incognito mode. It doesn't apply to the usual case. Maybe
rename it to something more suggestive of how its used...
kIncognitoSqliteBackendQuota?

Also, could be a local const in the OnIDBFactoryOpen() method since that's the
only place it's used.

[dgrogan, 2011/08/25 23:28:58]

Done.

 
 template <class T>
 void DeleteOnWebKitThread(T* obj) {
@@ -209,17 +208,6 @@ void IndexedDBDispatcherHost::OnIDBFactoryOpen(
   GURL origin_url(origin.toString());
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT));
-  DCHECK(kDefaultQuota == params.maximum_size);

[michaeln, 2011/08/25 18:23:17]

since the params.maximum_size value isn't used, it would be good to remove that
from the struct at some point

[dgrogan, 2011/08/25 23:28:58]

Removed.

-
-  uint64 quota = kDefaultQuota;
-  if (Context()->IsUnlimitedStorageGranted(origin_url) ||
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kUnlimitedQuotaForIndexedDB)) {
-      // TODO(jorlow): For the IsUnlimitedStorageGranted case, we need some
-      //       way to revoke it.
-      // TODO(jorlow): Use kint64max once we think we can scale over 1GB.
-      quota = 1024 * 1024 * 1024; // 1GB. More or less "unlimited".
-  }
 
   WebKit::WebIDBFactory::BackingStoreType backingStoreType =
       WebKit::WebIDBFactory::LevelDBBackingStore;
@@ -235,8 +223,8 @@ void IndexedDBDispatcherHost::OnIDBFactoryOpen(
       params.name,
       new IndexedDBCallbacks<WebIDBDatabase>(this, params.response_id,
                                              origin_url),
-      origin, NULL, webkit_glue::FilePathToWebString(indexed_db_path), quota,
-      backingStoreType);
+      origin, NULL, webkit_glue::FilePathToWebString(indexed_db_path),
+      kDefaultQuota, backingStoreType);
 }
 
 void IndexedDBDispatcherHost::OnIDBFactoryDeleteDatabase(