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

content/browser/in_process_webkit/indexed_db_dispatcher_host.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/in_process_webkit/indexed_db_dispatcher_host.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/in_process_webkit/indexed_db_callbacks.h"
@@ skipping 28 matching lines @@
 using WebKit::WebIDBKey;
 using WebKit::WebIDBKeyRange;
 using WebKit::WebIDBObjectStore;
 using WebKit::WebIDBTransaction;
 using WebKit::WebSecurityOrigin;
 using WebKit::WebSerializedScriptValue;
 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) {
   if (!BrowserThread::DeleteSoon(BrowserThread::WEBKIT, FROM_HERE, obj))
     delete obj;
 }
 
 }
 
 IndexedDBDispatcherHost::IndexedDBDispatcherHost(
@@ skipping 140 matching lines @@
   }
 
   // TODO(jorlow): This doesn't support file:/// urls properly. We probably need
   //               to add some toString method to WebSecurityOrigin that doesn't
   //               return null for them.
   WebSecurityOrigin origin(
       WebSecurityOrigin::createFromDatabaseIdentifier(params.origin));
   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;
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSQLiteIndexedDatabase)) {
     backingStoreType = WebKit::WebIDBFactory::SQLiteBackingStore;
   }
 
   // TODO(dgrogan): Don't let a non-existing database be opened (and therefore
   // created) if this origin is already over quota.
   Context()->GetIDBFactory()->open(
       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(
     const IndexedDBHostMsg_FactoryDeleteDatabase_Params& params) {
   FilePath base_path = webkit_context_->data_path();
   FilePath indexed_db_path;
   if (!base_path.empty()) {
     indexed_db_path = base_path.Append(
         IndexedDBContext::kIndexedDBDirectory);
   }
@@ skipping 814 matching lines @@
   }
   idb_transaction->didCompleteTaskEvents();
 }
 
 void IndexedDBDispatcherHost::TransactionDispatcherHost::OnDestroyed(
     int32 object_id) {
   transaction_size_map_.erase(object_id);
   transaction_url_map_.erase(object_id);
   parent_->DestroyObject(&map_, object_id);
 }