Reapply 43381 - Add some safeguards in DatabaseTracker to prevent writing anything to disk for incognito. This time with more unit tests.

TEST=manual and database_tracker_unittest.cc 
BUG=none 

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

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

3 files changed, 70 insertions, 19 deletions

diff --git a/webkit/database/database_tracker.cc b/webkit/database/database_tracker.cc
index 38c6298..e64f118 100644
--- a/webkit/database/database_tracker.cc
+++ b/webkit/database/database_tracker.cc
@@ -24,13 +24,15 @@ const FilePath::CharType kDatabaseDirectoryName[] =
     FILE_PATH_LITERAL("databases");
 const FilePath::CharType kTrackerDatabaseFileName[] =
     FILE_PATH_LITERAL("Databases.db");
-const int kCurrentVersion = 2;
-const int kCompatibleVersion = 1;
-const char* kExtensionOriginIdentifierPrefix = "chrome-extension_";
+static const int kCurrentVersion = 2;
+static const int kCompatibleVersion = 1;
+static const char* kExtensionOriginIdentifierPrefix = "chrome-extension_";
 
 DatabaseTracker::DatabaseTracker(const FilePath& profile_path)
-    : initialized_(false),
-      db_dir_(profile_path.Append(FilePath(kDatabaseDirectoryName))),
+    : is_initialized_(false),
+      is_incognito_(profile_path.empty()),
+      db_dir_(is_incognito_ ?
+          FilePath() : profile_path.Append(kDatabaseDirectoryName)),
       db_(new sql::Connection()),
       databases_table_(NULL),
       meta_table_(NULL),
@@ -82,12 +84,20 @@ void DatabaseTracker::DatabaseModified(const string16& origin_identifier,
 
 void DatabaseTracker::DatabaseClosed(const string16& origin_identifier,
                                      const string16& database_name) {
+  if (database_connections_.IsEmpty()) {
+    DCHECK(!is_initialized_);
+    return;
+  }
   database_connections_.RemoveConnection(origin_identifier, database_name);
   if (!database_connections_.IsDatabaseOpened(origin_identifier, database_name))
     DeleteDatabaseIfNeeded(origin_identifier, database_name);
 }
 
 void DatabaseTracker::CloseDatabases(const DatabaseConnections& connections) {
+  if (database_connections_.IsEmpty()) {
+    DCHECK(!is_initialized_ || connections.IsEmpty());
+    return;
+  }
   std::vector<std::pair<string16, string16> > closed_dbs;
   database_connections_.RemoveConnections(connections, &closed_dbs);
   for (std::vector<std::pair<string16, string16> >::iterator it =
@@ -148,14 +158,16 @@ void DatabaseTracker::CloseTrackerDatabaseAndClearCaches() {
   databases_table_.reset(NULL);
   quota_table_.reset(NULL);
   db_->Close();
-  initialized_ = false;
+  is_initialized_ = false;
 }
 
 FilePath DatabaseTracker::GetFullDBFilePath(
     const string16& origin_identifier,
-    const string16& database_name) const {
+    const string16& database_name) {
   DCHECK(!origin_identifier.empty());
   DCHECK(!database_name.empty());
+  if (!LazyInit())
+    return FilePath();
 
   int64 id = databases_table_->GetDatabaseID(
       origin_identifier, database_name);
@@ -273,7 +285,7 @@ bool DatabaseTracker::IsDatabaseScheduledForDeletion(
 }
 
 bool DatabaseTracker::LazyInit() {
-  if (!initialized_) {
+  if (!is_initialized_ && !is_incognito_) {
     DCHECK(!db_->is_open());
     DCHECK(!databases_table_.get());
     DCHECK(!quota_table_.get());
@@ -296,18 +308,18 @@ bool DatabaseTracker::LazyInit() {
     quota_table_.reset(new QuotaTable(db_.get()));
     meta_table_.reset(new sql::MetaTable());
 
-    initialized_ =
+    is_initialized_ =
         file_util::CreateDirectory(db_dir_) &&
         (db_->is_open() || db_->Open(kTrackerDatabaseFullPath)) &&
         UpgradeToCurrentVersion();
-    if (!initialized_) {
+    if (!is_initialized_) {
       databases_table_.reset(NULL);
       quota_table_.reset(NULL);
       meta_table_.reset(NULL);
       db_->Close();
     }
   }
-  return initialized_;
+  return is_initialized_;
 }
 
 bool DatabaseTracker::UpgradeToCurrentVersion() {
@@ -388,7 +400,7 @@ DatabaseTracker::CachedOriginInfo* DatabaseTracker::GetCachedOriginInfo(
 }
 
 int64 DatabaseTracker::GetDBFileSize(const string16& origin_identifier,
-                                     const string16& database_name) const {
+                                     const string16& database_name) {
   FilePath db_file_name = GetFullDBFilePath(origin_identifier, database_name);
   int64 db_file_size = 0;
   if (!file_util::GetFileSize(db_file_name, &db_file_size))
diff --git a/webkit/database/database_tracker.h b/webkit/database/database_tracker.h
index f7468e4..9bad23b 100644
--- a/webkit/database/database_tracker.h
+++ b/webkit/database/database_tracker.h
@@ -26,6 +26,9 @@ class MetaTable;
 
 namespace webkit_database {
 
+extern const FilePath::CharType kDatabaseDirectoryName[];
+extern const FilePath::CharType kTrackerDatabaseFileName[];
+
 class DatabasesTable;
 class QuotaTable;
 
@@ -110,8 +113,6 @@ class DatabaseTracker
   void DatabaseClosed(const string16& origin_identifier,
                       const string16& database_name);
   void CloseDatabases(const DatabaseConnections& connections);
-  void DeleteDatabaseIfNeeded(const string16& origin_identifier,
-                              const string16& database_name);
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
@@ -120,7 +121,7 @@ class DatabaseTracker
 
   const FilePath& DatabaseDirectory() const { return db_dir_; }
   FilePath GetFullDBFilePath(const string16& origin_identifier,
-                             const string16& database_name) const;
+                             const string16& database_name);
 
   bool GetAllOriginsInfo(std::vector<OriginInfo>* origins_info);
   void SetOriginQuota(const string16& origin_identifier, int64 new_quota);
@@ -188,6 +189,8 @@ class DatabaseTracker
   bool DeleteClosedDatabase(const string16& origin_identifier,
                             const string16& database_name);
   bool DeleteOrigin(const string16& origin_identifier);
+  void DeleteDatabaseIfNeeded(const string16& origin_identifier,
+                              const string16& database_name);
 
   bool LazyInit();
   bool UpgradeToCurrentVersion();
@@ -200,7 +203,7 @@ class DatabaseTracker
   CachedOriginInfo* GetCachedOriginInfo(const string16& origin_identifier);
 
   int64 GetDBFileSize(const string16& origin_identifier,
-                      const string16& database_name) const;
+                      const string16& database_name);
 
   int64 GetOriginSpaceAvailable(const string16& origin_identifier);
 
@@ -213,7 +216,8 @@ class DatabaseTracker
   void ScheduleDatabasesForDeletion(const DatabaseSet& databases,
                                     net::CompletionCallback* callback);
 
-  bool initialized_;
+  bool is_initialized_;
+  const bool is_incognito_;
   const FilePath db_dir_;
   scoped_ptr<sql::Connection> db_;
   scoped_ptr<DatabasesTable> databases_table_;
@@ -234,7 +238,8 @@ class DatabaseTracker
   // to quota_table_ every time an extention is loaded.
   std::map<string16, int64> in_memory_quotas_;
 
-  FRIEND_TEST(DatabaseTrackerTest, TestIt);
+  FRIEND_TEST(DatabaseTrackerTest, DatabaseTracker);
+  FRIEND_TEST(DatabaseTrackerTest, NoInitIncognito);
 };
 
 }  // namespace webkit_database
diff --git a/webkit/database/database_tracker_unittest.cc b/webkit/database/database_tracker_unittest.cc
index 88e8981..14bd480 100644
--- a/webkit/database/database_tracker_unittest.cc
+++ b/webkit/database/database_tracker_unittest.cc
@@ -167,7 +167,7 @@ TEST(DatabaseTrackerTest, DeleteOpenDatabase) {
   tracker->RemoveObserver(&observer);
 }
 
-TEST(DatabaseTrackerTest, TestIt) {
+TEST(DatabaseTrackerTest, DatabaseTracker) {
   // Initialize the tracker database.
   ScopedTempDir temp_dir;
   EXPECT_TRUE(temp_dir.CreateUniqueTempDir());
@@ -361,4 +361,38 @@ TEST(DatabaseTrackerTest, TestIt) {
   EXPECT_EQ(origin1_quota, tracker->GetOriginSpaceAvailable(kOrigin1));
 }
 
+TEST(DatabaseTrackerTest, NoInitIncognito) {
+  const string16 kOrigin = ASCIIToUTF16("origin");
+  const string16 kName = ASCIIToUTF16("name");
+  const string16 kDescription = ASCIIToUTF16("description");
+  const DatabaseConnections kEmptyCollection;
+
+  std::vector<OriginInfo> infos;
+  scoped_refptr<DatabaseTracker> tracker(new DatabaseTracker(FilePath()));
+  EXPECT_TRUE(tracker->is_incognito_);
+  EXPECT_FALSE(tracker->LazyInit());
+  EXPECT_TRUE(tracker->DatabaseDirectory().empty());
+  EXPECT_TRUE(tracker->GetFullDBFilePath(kOrigin, kName).empty());
+  EXPECT_FALSE(tracker->GetAllOriginsInfo(&infos));
+  EXPECT_FALSE(tracker->IsDatabaseScheduledForDeletion(kOrigin, kName));
+  EXPECT_EQ(net::ERR_FAILED,
+            tracker->DeleteDatabase(kOrigin, kName, NULL));
+  EXPECT_EQ(net::ERR_FAILED,
+            tracker->DeleteDataModifiedSince(base::Time(), NULL));
+  EXPECT_EQ(net::ERR_FAILED,
+            tracker->DeleteDataForOrigin(kOrigin, NULL));
+
+  // These should not assert or crash when called in this state.
+  int64 size_out(0), space_available_out(0);
+  tracker->DatabaseOpened(kOrigin, kName, kDescription, 1,
+                          &size_out, &space_available_out);
+  tracker->DatabaseModified(kOrigin, kName);
+  tracker->DatabaseClosed(kOrigin, kName);
+  tracker->CloseDatabases(kEmptyCollection);
+  tracker->CloseTrackerDatabaseAndClearCaches();
+  tracker->SetOriginQuota(kOrigin, 5);
+  tracker->SetOriginQuotaInMemory(kOrigin, 5);
+  tracker->ResetOriginQuotaInMemory(kOrigin);
+}
+
 }  // namespace webkit_database