Adds support for SetDatabaseQuota(). Also, should remove a lot of

flakiness from the database layout tests: when a DB test calls
ClearAllDatabases(), we force test_shell to wait for all DBs opened in
previous tests to close before running the test.

TEST=none
BUG=32016,32396,32206,32157,30081

Review URL: http://codereview.chromium.org/549095

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36919 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 3 deletions

diff --git a/webkit/database/database_tracker.cc b/webkit/database/database_tracker.cc
index 16766b4..01c3052 100644
--- a/webkit/database/database_tracker.cc
+++ b/webkit/database/database_tracker.cc
@@ -25,7 +25,6 @@ const FilePath::CharType kTrackerDatabaseFileName[] =
     FILE_PATH_LITERAL("Databases.db");
 const int kCurrentVersion = 2;
 const int kCompatibleVersion = 1;
-const int64 kDefaultQuota = 5 * 1024 * 1024;
 const int64 kDefaultExtensionQuota = 50 * 1024 * 1024;
 const char* kExtensionOriginIdentifierPrefix = "chrome-extension_";
 
@@ -34,13 +33,19 @@ DatabaseTracker::DatabaseTracker(const FilePath& profile_path)
       db_dir_(profile_path.Append(FilePath(kDatabaseDirectoryName))),
       db_(new sql::Connection()),
       databases_table_(NULL),
-      meta_table_(NULL) {
+      meta_table_(NULL),
+      default_quota_(5 * 1024 * 1024) {
 }
 
 DatabaseTracker::~DatabaseTracker() {
   DCHECK(observers_.size() == 0);
 }
 
+void DatabaseTracker::SetDefaultQuota(int64 quota) {
+  default_quota_ = quota;
+  ClearAllCachedOriginInfo();
+}
+
 void DatabaseTracker::DatabaseOpened(const string16& origin_identifier,
                                      const string16& database_name,
                                      const string16& database_description,
@@ -291,7 +296,7 @@ DatabaseTracker::CachedOriginInfo* DatabaseTracker::GetCachedOriginInfo(
                           true)) {
       origin_info.SetQuota(kDefaultExtensionQuota);
     } else {
-      origin_info.SetQuota(kDefaultQuota);
+      origin_info.SetQuota(default_quota_);
     }
   }