Quota: Clean up QuotaDatabase

BUG=n/a
TEST=content_unittests

Review URL: https://codereview.chromium.org/141663003

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

4 files changed, 33 insertions, 43 deletions

diff --git a/webkit/browser/quota/quota_database.cc b/webkit/browser/quota/quota_database.cc
index 1905f6f..03bed77 100644
--- a/webkit/browser/quota/quota_database.cc
+++ b/webkit/browser/quota/quota_database.cc
@@ -5,6 +5,7 @@
 #include "webkit/browser/quota/quota_database.h"
 
 #include <string>
+#include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ -573,9 +574,10 @@ bool QuotaDatabase::UpgradeSchema(int current_version) {
   if (current_version == 2) {
     QuotaTableImporter importer;
     typedef std::vector<QuotaTableEntry> QuotaTableEntries;
-    if (!DumpQuotaTable(new QuotaTableCallback(base::Bind(
-        &QuotaTableImporter::Append, base::Unretained(&importer)))))
+    if (!DumpQuotaTable(base::Bind(&QuotaTableImporter::Append,
+                                   base::Unretained(&importer)))) {
       return false;
+    }
     ResetSchema();
     for (QuotaTableEntries::const_iterator iter = importer.entries.begin();
          iter != importer.entries.end(); ++iter) {
@@ -588,8 +590,7 @@ bool QuotaDatabase::UpgradeSchema(int current_version) {
   return false;
 }
 
-bool QuotaDatabase::DumpQuotaTable(QuotaTableCallback* callback) {
-  scoped_ptr<QuotaTableCallback> callback_deleter(callback);
+bool QuotaDatabase::DumpQuotaTable(const QuotaTableCallback& callback) {
   if (!LazyOpen(true))
     return false;
 
@@ -602,7 +603,7 @@ bool QuotaDatabase::DumpQuotaTable(QuotaTableCallback* callback) {
       static_cast<StorageType>(statement.ColumnInt(1)),
       statement.ColumnInt64(2));
 
-    if (!callback->Run(entry))
+    if (!callback.Run(entry))
       return true;
   }
 
@@ -610,8 +611,7 @@ bool QuotaDatabase::DumpQuotaTable(QuotaTableCallback* callback) {
 }
 
 bool QuotaDatabase::DumpOriginInfoTable(
-    OriginInfoTableCallback* callback) {
-  scoped_ptr<OriginInfoTableCallback> callback_deleter(callback);
+    const OriginInfoTableCallback& callback) {
 
   if (!LazyOpen(true))
     return false;
@@ -627,7 +627,7 @@ bool QuotaDatabase::DumpOriginInfoTable(
       base::Time::FromInternalValue(statement.ColumnInt64(3)),
       base::Time::FromInternalValue(statement.ColumnInt64(4)));
 
-    if (!callback->Run(entry))
+    if (!callback.Run(entry))
       return true;
   }
 
@@ -654,4 +654,4 @@ bool operator<(const QuotaDatabase::OriginInfoTableEntry& lhs,
   return lhs.last_access_time < rhs.last_access_time;
 }
 
-}  // quota namespace
+}  // namespace quota
diff --git a/webkit/browser/quota/quota_database.h b/webkit/browser/quota/quota_database.h
index 92ec159..d12bf94 100644
--- a/webkit/browser/quota/quota_database.h
+++ b/webkit/browser/quota/quota_database.h
@@ -160,8 +160,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE QuotaDatabase {
       const IndexSchema* indexes, size_t indexes_size);
 
   // |callback| may return false to stop reading data.
-  bool DumpQuotaTable(QuotaTableCallback* callback);
-  bool DumpOriginInfoTable(OriginInfoTableCallback* callback);
+  bool DumpQuotaTable(const QuotaTableCallback& callback);
+  bool DumpOriginInfoTable(const OriginInfoTableCallback& callback);
 
   base::FilePath db_file_path_;
 
diff --git a/webkit/browser/quota/quota_database_unittest.cc b/webkit/browser/quota/quota_database_unittest.cc
index e457da5..d20f723 100644
--- a/webkit/browser/quota/quota_database_unittest.cc
+++ b/webkit/browser/quota/quota_database_unittest.cc
@@ -25,6 +25,8 @@ namespace {
 
 const base::Time kZeroTime;
 
+const char kDBFileName[] = "quota_manager.db";
+
 }  // namespace
 
 class QuotaDatabaseTest : public testing::Test {
@@ -58,9 +60,7 @@ class QuotaDatabaseTest : public testing::Test {
     typedef EntryVerifier<QuotaTableEntry> Verifier;
     Verifier verifier(entries, entries + ARRAYSIZE_UNSAFE(entries));
     EXPECT_TRUE(db.DumpQuotaTable(
-        new QuotaTableCallback(
-            base::Bind(&Verifier::Run,
-                       base::Unretained(&verifier)))));
+        base::Bind(&Verifier::Run, base::Unretained(&verifier))));
     EXPECT_TRUE(verifier.table.empty());
   }
 
@@ -342,9 +342,7 @@ class QuotaDatabaseTest : public testing::Test {
     typedef EntryVerifier<QuotaTableEntry> Verifier;
     Verifier verifier(begin, end);
     EXPECT_TRUE(db.DumpQuotaTable(
-        new QuotaTableCallback(
-            base::Bind(&Verifier::Run,
-                       base::Unretained(&verifier)))));
+        base::Bind(&Verifier::Run, base::Unretained(&verifier))));
     EXPECT_TRUE(verifier.table.empty());
   }
 
@@ -367,9 +365,7 @@ class QuotaDatabaseTest : public testing::Test {
     typedef EntryVerifier<Entry> Verifier;
     Verifier verifier(begin, end);
     EXPECT_TRUE(db.DumpOriginInfoTable(
-        new OriginInfoTableCallback(
-            base::Bind(&Verifier::Run,
-                       base::Unretained(&verifier)))));
+        base::Bind(&Verifier::Run, base::Unretained(&verifier))));
     EXPECT_TRUE(verifier.table.empty());
   }
 
@@ -483,7 +479,7 @@ class QuotaDatabaseTest : public testing::Test {
 TEST_F(QuotaDatabaseTest, LazyOpen) {
   base::ScopedTempDir data_dir;
   ASSERT_TRUE(data_dir.CreateUniqueTempDir());
-  const base::FilePath kDbFile = data_dir.path().AppendASCII("quota_manager.db");
+  const base::FilePath kDbFile = data_dir.path().AppendASCII(kDBFileName);
   LazyOpen(kDbFile);
   LazyOpen(base::FilePath());
 }
@@ -491,14 +487,14 @@ TEST_F(QuotaDatabaseTest, LazyOpen) {
 TEST_F(QuotaDatabaseTest, UpgradeSchema) {
   base::ScopedTempDir data_dir;
   ASSERT_TRUE(data_dir.CreateUniqueTempDir());
-  const base::FilePath kDbFile = data_dir.path().AppendASCII("quota_manager.db");
+  const base::FilePath kDbFile = data_dir.path().AppendASCII(kDBFileName);
   UpgradeSchemaV2toV3(kDbFile);
 }
 
 TEST_F(QuotaDatabaseTest, HostQuota) {
   base::ScopedTempDir data_dir;
   ASSERT_TRUE(data_dir.CreateUniqueTempDir());
-  const base::FilePath kDbFile = data_dir.path().AppendASCII("quota_manager.db");
+  const base::FilePath kDbFile = data_dir.path().AppendASCII(kDBFileName);
   HostQuota(kDbFile);
   HostQuota(base::FilePath());
 }
@@ -506,7 +502,7 @@ TEST_F(QuotaDatabaseTest, HostQuota) {
 TEST_F(QuotaDatabaseTest, GlobalQuota) {
   base::ScopedTempDir data_dir;
   ASSERT_TRUE(data_dir.CreateUniqueTempDir());
-  const base::FilePath kDbFile = data_dir.path().AppendASCII("quota_manager.db");
+  const base::FilePath kDbFile = data_dir.path().AppendASCII(kDBFileName);
   GlobalQuota(kDbFile);
   GlobalQuota(base::FilePath());
 }
@@ -514,7 +510,7 @@ TEST_F(QuotaDatabaseTest, GlobalQuota) {
 TEST_F(QuotaDatabaseTest, OriginLastAccessTimeLRU) {
   base::ScopedTempDir data_dir;
   ASSERT_TRUE(data_dir.CreateUniqueTempDir());
-  const base::FilePath kDbFile = data_dir.path().AppendASCII("quota_manager.db");
+  const base::FilePath kDbFile = data_dir.path().AppendASCII(kDBFileName);
   OriginLastAccessTimeLRU(kDbFile);
   OriginLastAccessTimeLRU(base::FilePath());
 }
@@ -522,7 +518,7 @@ TEST_F(QuotaDatabaseTest, OriginLastAccessTimeLRU) {
 TEST_F(QuotaDatabaseTest, OriginLastModifiedSince) {
   base::ScopedTempDir data_dir;
   ASSERT_TRUE(data_dir.CreateUniqueTempDir());
-  const base::FilePath kDbFile = data_dir.path().AppendASCII("quota_manager.db");
+  const base::FilePath kDbFile = data_dir.path().AppendASCII(kDBFileName);
   OriginLastModifiedSince(kDbFile);
   OriginLastModifiedSince(base::FilePath());
 }
@@ -531,7 +527,7 @@ TEST_F(QuotaDatabaseTest, BootstrapFlag) {
   base::ScopedTempDir data_dir;
   ASSERT_TRUE(data_dir.CreateUniqueTempDir());
 
-  const base::FilePath kDbFile = data_dir.path().AppendASCII("quota_manager.db");
+  const base::FilePath kDbFile = data_dir.path().AppendASCII(kDBFileName);
   QuotaDatabase db(kDbFile);
 
   EXPECT_FALSE(db.IsOriginDatabaseBootstrapped());
@@ -544,7 +540,7 @@ TEST_F(QuotaDatabaseTest, BootstrapFlag) {
 TEST_F(QuotaDatabaseTest, RegisterInitialOriginInfo) {
   base::ScopedTempDir data_dir;
   ASSERT_TRUE(data_dir.CreateUniqueTempDir());
-  const base::FilePath kDbFile = data_dir.path().AppendASCII("quota_manager.db");
+  const base::FilePath kDbFile = data_dir.path().AppendASCII(kDBFileName);
   RegisterInitialOriginInfo(kDbFile);
   RegisterInitialOriginInfo(base::FilePath());
 }
@@ -552,7 +548,7 @@ TEST_F(QuotaDatabaseTest, RegisterInitialOriginInfo) {
 TEST_F(QuotaDatabaseTest, DumpQuotaTable) {
   base::ScopedTempDir data_dir;
   ASSERT_TRUE(data_dir.CreateUniqueTempDir());
-  const base::FilePath kDbFile = data_dir.path().AppendASCII("quota_manager.db");
+  const base::FilePath kDbFile = data_dir.path().AppendASCII(kDBFileName);
   DumpQuotaTable(kDbFile);
   DumpQuotaTable(base::FilePath());
 }
@@ -560,7 +556,7 @@ TEST_F(QuotaDatabaseTest, DumpQuotaTable) {
 TEST_F(QuotaDatabaseTest, DumpOriginInfoTable) {
   base::ScopedTempDir data_dir;
   ASSERT_TRUE(data_dir.CreateUniqueTempDir());
-  const base::FilePath kDbFile = data_dir.path().AppendASCII("quota_manager.db");
+  const base::FilePath kDbFile = data_dir.path().AppendASCII(kDBFileName);
   DumpOriginInfoTable(kDbFile);
   DumpOriginInfoTable(base::FilePath());
 }
diff --git a/webkit/browser/quota/quota_manager.cc b/webkit/browser/quota/quota_manager.cc
index bc94ff7..244c6b4 100644
--- a/webkit/browser/quota/quota_manager.cc
+++ b/webkit/browser/quota/quota_manager.cc
@@ -185,7 +185,7 @@ bool UpdateModifiedTimeOnDBThread(const GURL& origin,
 
 int64 CallSystemGetAmountOfFreeDiskSpace(const base::FilePath& profile_path) {
   // Ensure the profile path exists.
-  if(!base::CreateDirectory(profile_path)) {
+  if (!base::CreateDirectory(profile_path)) {
     LOG(WARNING) << "Create directory failed for path" << profile_path.value();
     return 0;
   }
@@ -311,7 +311,7 @@ class UsageAndQuotaCallbackDispatcher
     : public QuotaTask,
       public base::SupportsWeakPtr<UsageAndQuotaCallbackDispatcher> {
  public:
-  UsageAndQuotaCallbackDispatcher(QuotaManager* manager)
+  explicit UsageAndQuotaCallbackDispatcher(QuotaManager* manager)
       : QuotaTask(manager),
         has_usage_(false),
         has_global_limited_usage_(false),
@@ -451,9 +451,6 @@ class UsageAndQuotaCallbackDispatcher
 };
 
 class QuotaManager::GetUsageInfoTask : public QuotaTask {
- private:
-  typedef QuotaManager::GetUsageInfoTask self_type;
-
  public:
   GetUsageInfoTask(
       QuotaManager* manager,
@@ -574,6 +571,7 @@ class QuotaManager::OriginDataDeleter : public QuotaTask {
     DeleteSoon();
   }
 
+ private:
   void DidDeleteOriginData(QuotaStatusCode status) {
     DCHECK_GT(remaining_clients_, 0);
 
@@ -644,6 +642,7 @@ class QuotaManager::HostDataDeleter : public QuotaTask {
     DeleteSoon();
   }
 
+ private:
   void DidGetOriginsForHost(const std::set<GURL>& origins) {
     DCHECK_GT(remaining_clients_, 0);
 
@@ -729,8 +728,7 @@ class QuotaManager::DumpQuotaTableHelper {
   bool DumpQuotaTableOnDBThread(QuotaDatabase* database) {
     DCHECK(database);
     return database->DumpQuotaTable(
-        new TableCallback(base::Bind(&DumpQuotaTableHelper::AppendEntry,
-                                     base::Unretained(this))));
+        base::Bind(&DumpQuotaTableHelper::AppendEntry, base::Unretained(this)));
   }
 
   void DidDumpQuotaTable(const base::WeakPtr<QuotaManager>& manager,
@@ -746,8 +744,6 @@ class QuotaManager::DumpQuotaTableHelper {
   }
 
  private:
-  typedef QuotaDatabase::QuotaTableCallback TableCallback;
-
   bool AppendEntry(const QuotaTableEntry& entry) {
     entries_.push_back(entry);
     return true;
@@ -761,8 +757,8 @@ class QuotaManager::DumpOriginInfoTableHelper {
   bool DumpOriginInfoTableOnDBThread(QuotaDatabase* database) {
     DCHECK(database);
     return database->DumpOriginInfoTable(
-        new TableCallback(base::Bind(&DumpOriginInfoTableHelper::AppendEntry,
-                                     base::Unretained(this))));
+        base::Bind(&DumpOriginInfoTableHelper::AppendEntry,
+                   base::Unretained(this)));
   }
 
   void DidDumpOriginInfoTable(const base::WeakPtr<QuotaManager>& manager,
@@ -778,8 +774,6 @@ class QuotaManager::DumpOriginInfoTableHelper {
   }
 
  private:
-  typedef QuotaDatabase::OriginInfoTableCallback TableCallback;
-
   bool AppendEntry(const OriginInfoTableEntry& entry) {
     entries_.push_back(entry);
     return true;