diff options
author | pilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 21:46:25 +0000 |
---|---|---|
committer | pilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 21:46:25 +0000 |
commit | 523e5c590175633e4a0887e9b02808d40b7835e2 (patch) | |
tree | e81e8aead747e0394ee29f2f1e46a0a637586843 /webkit | |
parent | 559a9a4fd35509a6acd6a10bb463230e1512eb1b (diff) | |
download | chromium_src-523e5c590175633e4a0887e9b02808d40b7835e2.zip chromium_src-523e5c590175633e4a0887e9b02808d40b7835e2.tar.gz chromium_src-523e5c590175633e4a0887e9b02808d40b7835e2.tar.bz2 |
Move mock_special_storage_policy from webkit/ to content/public/test/
BUG=338338
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/259083002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/browser/database/database_tracker.h | 7 | ||||
-rw-r--r-- | webkit/browser/database/database_tracker_unittest.cc | 871 | ||||
-rw-r--r-- | webkit/browser/quota/mock_special_storage_policy.cc | 47 | ||||
-rw-r--r-- | webkit/browser/quota/mock_special_storage_policy.h | 101 |
4 files changed, 6 insertions, 1020 deletions
diff --git a/webkit/browser/database/database_tracker.h b/webkit/browser/database/database_tracker.h index 8223d1c..25d4986 100644 --- a/webkit/browser/database/database_tracker.h +++ b/webkit/browser/database/database_tracker.h @@ -26,6 +26,10 @@ namespace base { class MessageLoopProxy; } +namespace content { +class DatabaseTracker_TestHelper_Test; +} + namespace sql { class Connection; class MetaTable; @@ -179,7 +183,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT DatabaseTracker private: friend class base::RefCountedThreadSafe<DatabaseTracker>; - friend class MockDatabaseTracker; // for testing + friend class content::DatabaseTracker_TestHelper_Test; + friend class MockDatabaseTracker; // for testing typedef std::map<std::string, std::set<base::string16> > DatabaseSet; typedef std::vector<std::pair<net::CompletionCallback, DatabaseSet> > diff --git a/webkit/browser/database/database_tracker_unittest.cc b/webkit/browser/database/database_tracker_unittest.cc deleted file mode 100644 index 2e8b121..0000000 --- a/webkit/browser/database/database_tracker_unittest.cc +++ /dev/null @@ -1,871 +0,0 @@ -// Copyright (c) 2012 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 "base/file_util.h" -#include "base/files/file.h" -#include "base/files/file_path.h" -#include "base/files/scoped_temp_dir.h" -#include "base/memory/scoped_ptr.h" -#include "base/message_loop/message_loop.h" -#include "base/message_loop/message_loop_proxy.h" -#include "base/strings/utf_string_conversions.h" -#include "base/time/time.h" -#include "net/base/net_errors.h" -#include "net/base/test_completion_callback.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "third_party/sqlite/sqlite3.h" -#include "webkit/browser/database/database_tracker.h" -#include "webkit/browser/quota/mock_special_storage_policy.h" -#include "webkit/browser/quota/quota_manager_proxy.h" -#include "webkit/common/database/database_identifier.h" - -using base::ASCIIToUTF16; - -namespace { - -const char kOrigin1Url[] = "http://origin1"; -const char kOrigin2Url[] = "http://protected_origin2"; - -class TestObserver : public webkit_database::DatabaseTracker::Observer { - public: - TestObserver() - : new_notification_received_(false), - observe_size_changes_(true), - observe_scheduled_deletions_(true) { - } - TestObserver(bool observe_size_changes, bool observe_scheduled_deletions) - : new_notification_received_(false), - observe_size_changes_(observe_size_changes), - observe_scheduled_deletions_(observe_scheduled_deletions) { - } - - virtual ~TestObserver() {} - virtual void OnDatabaseSizeChanged(const std::string& origin_identifier, - const base::string16& database_name, - int64 database_size) OVERRIDE { - if (!observe_size_changes_) - return; - new_notification_received_ = true; - origin_identifier_ = origin_identifier; - database_name_ = database_name; - database_size_ = database_size; - } - virtual void OnDatabaseScheduledForDeletion( - const std::string& origin_identifier, - const base::string16& database_name) OVERRIDE { - if (!observe_scheduled_deletions_) - return; - new_notification_received_ = true; - origin_identifier_ = origin_identifier; - database_name_ = database_name; - } - bool DidReceiveNewNotification() { - bool temp_new_notification_received = new_notification_received_; - new_notification_received_ = false; - return temp_new_notification_received; - } - std::string GetNotificationOriginIdentifier() { - return origin_identifier_; - } - base::string16 GetNotificationDatabaseName() { return database_name_; } - int64 GetNotificationDatabaseSize() { return database_size_; } - - private: - bool new_notification_received_; - bool observe_size_changes_; - bool observe_scheduled_deletions_; - std::string origin_identifier_; - base::string16 database_name_; - int64 database_size_; -}; - -void CheckNotificationReceived(TestObserver* observer, - const std::string& expected_origin_identifier, - const base::string16& expected_database_name, - int64 expected_database_size) { - EXPECT_TRUE(observer->DidReceiveNewNotification()); - EXPECT_EQ(expected_origin_identifier, - observer->GetNotificationOriginIdentifier()); - EXPECT_EQ(expected_database_name, - observer->GetNotificationDatabaseName()); - EXPECT_EQ(expected_database_size, - observer->GetNotificationDatabaseSize()); -} - -class TestQuotaManagerProxy : public quota::QuotaManagerProxy { - public: - TestQuotaManagerProxy() - : QuotaManagerProxy(NULL, NULL), - registered_client_(NULL) { - } - - virtual void RegisterClient(quota::QuotaClient* client) OVERRIDE { - EXPECT_FALSE(registered_client_); - registered_client_ = client; - } - - virtual void NotifyStorageAccessed(quota::QuotaClient::ID client_id, - const GURL& origin, - quota::StorageType type) OVERRIDE { - EXPECT_EQ(quota::QuotaClient::kDatabase, client_id); - EXPECT_EQ(quota::kStorageTypeTemporary, type); - accesses_[origin] += 1; - } - - virtual void NotifyStorageModified(quota::QuotaClient::ID client_id, - const GURL& origin, - quota::StorageType type, - int64 delta) OVERRIDE { - EXPECT_EQ(quota::QuotaClient::kDatabase, client_id); - EXPECT_EQ(quota::kStorageTypeTemporary, type); - modifications_[origin].first += 1; - modifications_[origin].second += delta; - } - - // Not needed for our tests. - virtual void NotifyOriginInUse(const GURL& origin) OVERRIDE {} - virtual void NotifyOriginNoLongerInUse(const GURL& origin) OVERRIDE {} - virtual void SetUsageCacheEnabled(quota::QuotaClient::ID client_id, - const GURL& origin, - quota::StorageType type, - bool enabled) OVERRIDE {} - virtual void GetUsageAndQuota( - base::SequencedTaskRunner* original_task_runner, - const GURL& origin, - quota::StorageType type, - const GetUsageAndQuotaCallback& callback) OVERRIDE {} - - void SimulateQuotaManagerDestroyed() { - if (registered_client_) { - registered_client_->OnQuotaManagerDestroyed(); - registered_client_ = NULL; - } - } - - bool WasAccessNotified(const GURL& origin) { - return accesses_[origin] != 0; - } - - bool WasModificationNotified(const GURL& origin, int64 amount) { - return modifications_[origin].first != 0 && - modifications_[origin].second == amount; - } - - void reset() { - accesses_.clear(); - modifications_.clear(); - } - - quota::QuotaClient* registered_client_; - - // Map from origin to count of access notifications. - std::map<GURL, int> accesses_; - - // Map from origin to <count, sum of deltas> - std::map<GURL, std::pair<int, int64> > modifications_; - - protected: - virtual ~TestQuotaManagerProxy() { - EXPECT_FALSE(registered_client_); - } -}; - - -bool EnsureFileOfSize(const base::FilePath& file_path, int64 length) { - base::File file(file_path, - base::File::FLAG_OPEN_ALWAYS | base::File::FLAG_WRITE); - if (!file.IsValid()) - return false; - return file.SetLength(length); -} - -} // namespace - -namespace webkit_database { - -// We declare a helper class, and make it a friend of DatabaseTracker using -// the FRIEND_TEST() macro, and we implement all tests we want to run as -// static methods of this class. Then we make our TEST() targets call these -// static functions. This allows us to run each test in normal mode and -// incognito mode without writing the same code twice. -class DatabaseTracker_TestHelper_Test { - public: - static void TestDeleteOpenDatabase(bool incognito_mode) { - // Initialize the tracker database. - base::ScopedTempDir temp_dir; - ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); - scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy = - new quota::MockSpecialStoragePolicy; - special_storage_policy->AddProtected(GURL(kOrigin2Url)); - scoped_refptr<DatabaseTracker> tracker( - new DatabaseTracker(temp_dir.path(), - incognito_mode, - special_storage_policy.get(), - NULL, - NULL)); - - // Create and open three databases. - int64 database_size = 0; - const std::string kOrigin1 = - webkit_database::GetIdentifierFromOrigin(GURL(kOrigin1Url)); - const std::string kOrigin2 = - webkit_database::GetIdentifierFromOrigin(GURL(kOrigin2Url)); - const base::string16 kDB1 = ASCIIToUTF16("db1"); - const base::string16 kDB2 = ASCIIToUTF16("db2"); - const base::string16 kDB3 = ASCIIToUTF16("db3"); - const base::string16 kDescription = ASCIIToUTF16("database_description"); - - tracker->DatabaseOpened(kOrigin1, kDB1, kDescription, 0, - &database_size); - tracker->DatabaseOpened(kOrigin2, kDB2, kDescription, 0, - &database_size); - tracker->DatabaseOpened(kOrigin2, kDB3, kDescription, 0, - &database_size); - - EXPECT_TRUE(base::CreateDirectory( - tracker->DatabaseDirectory().Append(base::FilePath::FromUTF16Unsafe( - tracker->GetOriginDirectory(kOrigin1))))); - EXPECT_TRUE(base::CreateDirectory( - tracker->DatabaseDirectory().Append(base::FilePath::FromUTF16Unsafe( - tracker->GetOriginDirectory(kOrigin2))))); - EXPECT_EQ(1, base::WriteFile( - tracker->GetFullDBFilePath(kOrigin1, kDB1), "a", 1)); - EXPECT_EQ(2, base::WriteFile( - tracker->GetFullDBFilePath(kOrigin2, kDB2), "aa", 2)); - EXPECT_EQ(3, base::WriteFile( - tracker->GetFullDBFilePath(kOrigin2, kDB3), "aaa", 3)); - tracker->DatabaseModified(kOrigin1, kDB1); - tracker->DatabaseModified(kOrigin2, kDB2); - tracker->DatabaseModified(kOrigin2, kDB3); - - // Delete db1. Should also delete origin1. - TestObserver observer; - tracker->AddObserver(&observer); - net::TestCompletionCallback callback; - int result = tracker->DeleteDatabase(kOrigin1, kDB1, callback.callback()); - EXPECT_EQ(net::ERR_IO_PENDING, result); - ASSERT_FALSE(callback.have_result()); - EXPECT_TRUE(observer.DidReceiveNewNotification()); - EXPECT_EQ(kOrigin1, observer.GetNotificationOriginIdentifier()); - EXPECT_EQ(kDB1, observer.GetNotificationDatabaseName()); - tracker->DatabaseClosed(kOrigin1, kDB1); - result = callback.GetResult(result); - EXPECT_EQ(net::OK, result); - EXPECT_FALSE(base::PathExists( - tracker->DatabaseDirectory().AppendASCII(kOrigin1))); - - // Recreate db1. - tracker->DatabaseOpened(kOrigin1, kDB1, kDescription, 0, - &database_size); - EXPECT_TRUE(base::CreateDirectory( - tracker->DatabaseDirectory().Append(base::FilePath::FromUTF16Unsafe( - tracker->GetOriginDirectory(kOrigin1))))); - EXPECT_EQ(1, base::WriteFile( - tracker->GetFullDBFilePath(kOrigin1, kDB1), "a", 1)); - tracker->DatabaseModified(kOrigin1, kDB1); - - // Setup file modification times. db1 and db2 are modified now, db3 three - // days ago. - base::Time now = base::Time::Now(); - EXPECT_TRUE(base::TouchFile(tracker->GetFullDBFilePath(kOrigin1, kDB1), - now, now)); - EXPECT_TRUE(base::TouchFile(tracker->GetFullDBFilePath(kOrigin2, kDB2), - now, now)); - base::Time three_days_ago = now - base::TimeDelta::FromDays(3); - EXPECT_TRUE(base::TouchFile(tracker->GetFullDBFilePath(kOrigin2, kDB3), - three_days_ago, three_days_ago)); - - // Delete databases modified since yesterday. db2 is whitelisted. - base::Time yesterday = base::Time::Now(); - yesterday -= base::TimeDelta::FromDays(1); - result = tracker->DeleteDataModifiedSince( - yesterday, callback.callback()); - EXPECT_EQ(net::ERR_IO_PENDING, result); - ASSERT_FALSE(callback.have_result()); - EXPECT_TRUE(observer.DidReceiveNewNotification()); - tracker->DatabaseClosed(kOrigin1, kDB1); - tracker->DatabaseClosed(kOrigin2, kDB2); - result = callback.GetResult(result); - EXPECT_EQ(net::OK, result); - EXPECT_FALSE(base::PathExists( - tracker->DatabaseDirectory().AppendASCII(kOrigin1))); - EXPECT_TRUE( - base::PathExists(tracker->GetFullDBFilePath(kOrigin2, kDB2))); - EXPECT_TRUE( - base::PathExists(tracker->GetFullDBFilePath(kOrigin2, kDB3))); - - tracker->DatabaseClosed(kOrigin2, kDB3); - tracker->RemoveObserver(&observer); - } - - static void TestDatabaseTracker(bool incognito_mode) { - // Initialize the tracker database. - base::ScopedTempDir temp_dir; - ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); - scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy = - new quota::MockSpecialStoragePolicy; - special_storage_policy->AddProtected(GURL(kOrigin2Url)); - scoped_refptr<DatabaseTracker> tracker( - new DatabaseTracker(temp_dir.path(), - incognito_mode, - special_storage_policy.get(), - NULL, - NULL)); - - // Add two observers. - TestObserver observer1; - TestObserver observer2; - tracker->AddObserver(&observer1); - tracker->AddObserver(&observer2); - - // Open three new databases. - int64 database_size = 0; - const std::string kOrigin1 = - webkit_database::GetIdentifierFromOrigin(GURL(kOrigin1Url)); - const std::string kOrigin2 = - webkit_database::GetIdentifierFromOrigin(GURL(kOrigin2Url)); - const base::string16 kDB1 = ASCIIToUTF16("db1"); - const base::string16 kDB2 = ASCIIToUTF16("db2"); - const base::string16 kDB3 = ASCIIToUTF16("db3"); - const base::string16 kDescription = ASCIIToUTF16("database_description"); - - // Get the info for kOrigin1 and kOrigin2 - DatabaseTracker::CachedOriginInfo* origin1_info = - tracker->GetCachedOriginInfo(kOrigin1); - DatabaseTracker::CachedOriginInfo* origin2_info = - tracker->GetCachedOriginInfo(kOrigin1); - EXPECT_TRUE(origin1_info); - EXPECT_TRUE(origin2_info); - - - tracker->DatabaseOpened(kOrigin1, kDB1, kDescription, 0, - &database_size); - EXPECT_EQ(0, database_size); - tracker->DatabaseOpened(kOrigin2, kDB2, kDescription, 0, - &database_size); - EXPECT_EQ(0, database_size); - tracker->DatabaseOpened(kOrigin1, kDB3, kDescription, 0, - &database_size); - EXPECT_EQ(0, database_size); - - // Write some data to each file and check that the listeners are - // called with the appropriate values. - EXPECT_TRUE(base::CreateDirectory( - tracker->DatabaseDirectory().Append(base::FilePath::FromUTF16Unsafe( - tracker->GetOriginDirectory(kOrigin1))))); - EXPECT_TRUE(base::CreateDirectory( - tracker->DatabaseDirectory().Append(base::FilePath::FromUTF16Unsafe( - tracker->GetOriginDirectory(kOrigin2))))); - EXPECT_EQ(1, base::WriteFile( - tracker->GetFullDBFilePath(kOrigin1, kDB1), "a", 1)); - EXPECT_EQ(2, base::WriteFile( - tracker->GetFullDBFilePath(kOrigin2, kDB2), "aa", 2)); - EXPECT_EQ(4, base::WriteFile( - tracker->GetFullDBFilePath(kOrigin1, kDB3), "aaaa", 4)); - tracker->DatabaseModified(kOrigin1, kDB1); - CheckNotificationReceived(&observer1, kOrigin1, kDB1, 1); - CheckNotificationReceived(&observer2, kOrigin1, kDB1, 1); - tracker->DatabaseModified(kOrigin2, kDB2); - CheckNotificationReceived(&observer1, kOrigin2, kDB2, 2); - CheckNotificationReceived(&observer2, kOrigin2, kDB2, 2); - tracker->DatabaseModified(kOrigin1, kDB3); - CheckNotificationReceived(&observer1, kOrigin1, kDB3, 4); - CheckNotificationReceived(&observer2, kOrigin1, kDB3, 4); - - // Close all databases - tracker->DatabaseClosed(kOrigin1, kDB1); - tracker->DatabaseClosed(kOrigin2, kDB2); - tracker->DatabaseClosed(kOrigin1, kDB3); - - // Open an existing database and check the reported size - tracker->DatabaseOpened(kOrigin1, kDB1, kDescription, 0, - &database_size); - EXPECT_EQ(1, database_size); - tracker->DatabaseClosed(kOrigin1, kDB1); - - // Remove an observer; this should clear all caches. - tracker->RemoveObserver(&observer2); - - // Close the tracker database and clear all caches. - // Then make sure that DatabaseOpened() still returns the correct result. - tracker->CloseTrackerDatabaseAndClearCaches(); - tracker->DatabaseOpened(kOrigin1, kDB1, kDescription, 0, - &database_size); - EXPECT_EQ(1, database_size); - tracker->DatabaseClosed(kOrigin1, kDB1); - - // Remove all observers. - tracker->RemoveObserver(&observer1); - - // Trying to delete a database in use should fail - tracker->DatabaseOpened(kOrigin1, kDB3, kDescription, 0, - &database_size); - EXPECT_FALSE(tracker->DeleteClosedDatabase(kOrigin1, kDB3)); - origin1_info = tracker->GetCachedOriginInfo(kOrigin1); - EXPECT_TRUE(origin1_info); - EXPECT_EQ(4, origin1_info->GetDatabaseSize(kDB3)); - tracker->DatabaseClosed(kOrigin1, kDB3); - - // Delete a database and make sure the space used by that origin is updated - EXPECT_TRUE(tracker->DeleteClosedDatabase(kOrigin1, kDB3)); - origin1_info = tracker->GetCachedOriginInfo(kOrigin1); - EXPECT_TRUE(origin1_info); - EXPECT_EQ(1, origin1_info->GetDatabaseSize(kDB1)); - EXPECT_EQ(0, origin1_info->GetDatabaseSize(kDB3)); - - // Get all data for all origins - std::vector<OriginInfo> origins_info; - EXPECT_TRUE(tracker->GetAllOriginsInfo(&origins_info)); - EXPECT_EQ(size_t(2), origins_info.size()); - EXPECT_EQ(kOrigin1, origins_info[0].GetOriginIdentifier()); - EXPECT_EQ(1, origins_info[0].TotalSize()); - EXPECT_EQ(1, origins_info[0].GetDatabaseSize(kDB1)); - EXPECT_EQ(0, origins_info[0].GetDatabaseSize(kDB3)); - - EXPECT_EQ(kOrigin2, origins_info[1].GetOriginIdentifier()); - EXPECT_EQ(2, origins_info[1].TotalSize()); - - // Trying to delete an origin with databases in use should fail - tracker->DatabaseOpened(kOrigin1, kDB1, kDescription, 0, - &database_size); - EXPECT_FALSE(tracker->DeleteOrigin(kOrigin1, false)); - origin1_info = tracker->GetCachedOriginInfo(kOrigin1); - EXPECT_TRUE(origin1_info); - EXPECT_EQ(1, origin1_info->GetDatabaseSize(kDB1)); - tracker->DatabaseClosed(kOrigin1, kDB1); - - // Delete an origin that doesn't have any database in use - EXPECT_TRUE(tracker->DeleteOrigin(kOrigin1, false)); - origins_info.clear(); - EXPECT_TRUE(tracker->GetAllOriginsInfo(&origins_info)); - EXPECT_EQ(size_t(1), origins_info.size()); - EXPECT_EQ(kOrigin2, origins_info[0].GetOriginIdentifier()); - - origin1_info = tracker->GetCachedOriginInfo(kOrigin1); - EXPECT_TRUE(origin1_info); - EXPECT_EQ(0, origin1_info->TotalSize()); - } - - static void DatabaseTrackerQuotaIntegration() { - const GURL kOrigin(kOrigin1Url); - const std::string kOriginId = - webkit_database::GetIdentifierFromOrigin(kOrigin); - const base::string16 kName = ASCIIToUTF16("name"); - const base::string16 kDescription = ASCIIToUTF16("description"); - - base::ScopedTempDir temp_dir; - ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); - - // Initialize the tracker with a QuotaManagerProxy - scoped_refptr<TestQuotaManagerProxy> test_quota_proxy( - new TestQuotaManagerProxy); - scoped_refptr<DatabaseTracker> tracker( - new DatabaseTracker(temp_dir.path(), - false /* incognito */, - NULL, - test_quota_proxy.get(), - NULL)); - EXPECT_TRUE(test_quota_proxy->registered_client_); - - // Create a database and modify it a couple of times, close it, - // then delete it. Observe the tracker notifies accordingly. - - int64 database_size = 0; - tracker->DatabaseOpened(kOriginId, kName, kDescription, 0, - &database_size); - EXPECT_TRUE(test_quota_proxy->WasAccessNotified(kOrigin)); - test_quota_proxy->reset(); - - base::FilePath db_file(tracker->GetFullDBFilePath(kOriginId, kName)); - EXPECT_TRUE(base::CreateDirectory(db_file.DirName())); - EXPECT_TRUE(EnsureFileOfSize(db_file, 10)); - tracker->DatabaseModified(kOriginId, kName); - EXPECT_TRUE(test_quota_proxy->WasModificationNotified(kOrigin, 10)); - test_quota_proxy->reset(); - - EXPECT_TRUE(EnsureFileOfSize(db_file, 100)); - tracker->DatabaseModified(kOriginId, kName); - EXPECT_TRUE(test_quota_proxy->WasModificationNotified(kOrigin, 90)); - test_quota_proxy->reset(); - - tracker->DatabaseClosed(kOriginId, kName); - EXPECT_TRUE(test_quota_proxy->WasAccessNotified(kOrigin)); - EXPECT_EQ(net::OK, tracker->DeleteDatabase( - kOriginId, kName, net::CompletionCallback())); - EXPECT_TRUE(test_quota_proxy->WasModificationNotified(kOrigin, -100)); - test_quota_proxy->reset(); - - // Create a database and modify it, try to delete it while open, - // then close it (at which time deletion will actually occur). - // Observe the tracker notifies accordingly. - - tracker->DatabaseOpened(kOriginId, kName, kDescription, 0, - &database_size); - EXPECT_TRUE(test_quota_proxy->WasAccessNotified(kOrigin)); - test_quota_proxy->reset(); - - db_file = tracker->GetFullDBFilePath(kOriginId, kName); - EXPECT_TRUE(base::CreateDirectory(db_file.DirName())); - EXPECT_TRUE(EnsureFileOfSize(db_file, 100)); - tracker->DatabaseModified(kOriginId, kName); - EXPECT_TRUE(test_quota_proxy->WasModificationNotified(kOrigin, 100)); - test_quota_proxy->reset(); - - EXPECT_EQ(net::ERR_IO_PENDING, - tracker->DeleteDatabase(kOriginId, kName, - net::CompletionCallback())); - EXPECT_FALSE(test_quota_proxy->WasModificationNotified(kOrigin, -100)); - - tracker->DatabaseClosed(kOriginId, kName); - EXPECT_TRUE(test_quota_proxy->WasAccessNotified(kOrigin)); - EXPECT_TRUE(test_quota_proxy->WasModificationNotified(kOrigin, -100)); - test_quota_proxy->reset(); - - // Create a database and up the file size without telling - // the tracker about the modification, than simulate a - // a renderer crash. - // Observe the tracker notifies accordingly. - - tracker->DatabaseOpened(kOriginId, kName, kDescription, 0, - &database_size); - EXPECT_TRUE(test_quota_proxy->WasAccessNotified(kOrigin)); - test_quota_proxy->reset(); - db_file = tracker->GetFullDBFilePath(kOriginId, kName); - EXPECT_TRUE(base::CreateDirectory(db_file.DirName())); - EXPECT_TRUE(EnsureFileOfSize(db_file, 100)); - DatabaseConnections crashed_renderer_connections; - crashed_renderer_connections.AddConnection(kOriginId, kName); - EXPECT_FALSE(test_quota_proxy->WasModificationNotified(kOrigin, 100)); - tracker->CloseDatabases(crashed_renderer_connections); - EXPECT_TRUE(test_quota_proxy->WasModificationNotified(kOrigin, 100)); - - // Cleanup. - crashed_renderer_connections.RemoveAllConnections(); - test_quota_proxy->SimulateQuotaManagerDestroyed(); - } - - static void DatabaseTrackerClearSessionOnlyDatabasesOnExit() { - int64 database_size = 0; - const std::string kOrigin1 = - webkit_database::GetIdentifierFromOrigin(GURL(kOrigin1Url)); - const std::string kOrigin2 = - webkit_database::GetIdentifierFromOrigin(GURL(kOrigin2Url)); - const base::string16 kDB1 = ASCIIToUTF16("db1"); - const base::string16 kDB2 = ASCIIToUTF16("db2"); - const base::string16 kDescription = ASCIIToUTF16("database_description"); - - // Initialize the tracker database. - base::MessageLoop message_loop; - base::ScopedTempDir temp_dir; - ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); - base::FilePath origin1_db_dir; - base::FilePath origin2_db_dir; - { - scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy = - new quota::MockSpecialStoragePolicy; - special_storage_policy->AddSessionOnly(GURL(kOrigin2Url)); - scoped_refptr<DatabaseTracker> tracker( - new DatabaseTracker(temp_dir.path(), - false, - special_storage_policy.get(), - NULL, - base::MessageLoopProxy::current().get())); - - // Open two new databases. - tracker->DatabaseOpened(kOrigin1, kDB1, kDescription, 0, - &database_size); - EXPECT_EQ(0, database_size); - tracker->DatabaseOpened(kOrigin2, kDB2, kDescription, 0, - &database_size); - EXPECT_EQ(0, database_size); - - // Write some data to each file. - base::FilePath db_file; - db_file = tracker->GetFullDBFilePath(kOrigin1, kDB1); - EXPECT_TRUE(base::CreateDirectory(db_file.DirName())); - EXPECT_TRUE(EnsureFileOfSize(db_file, 1)); - - db_file = tracker->GetFullDBFilePath(kOrigin2, kDB2); - EXPECT_TRUE(base::CreateDirectory(db_file.DirName())); - EXPECT_TRUE(EnsureFileOfSize(db_file, 2)); - - // Store the origin database directories as long as they still exist. - origin1_db_dir = tracker->GetFullDBFilePath(kOrigin1, kDB1).DirName(); - origin2_db_dir = tracker->GetFullDBFilePath(kOrigin2, kDB2).DirName(); - - tracker->DatabaseModified(kOrigin1, kDB1); - tracker->DatabaseModified(kOrigin2, kDB2); - - // Close all databases. - tracker->DatabaseClosed(kOrigin1, kDB1); - tracker->DatabaseClosed(kOrigin2, kDB2); - - tracker->Shutdown(); - } - - // At this point, the database tracker should be gone. Create a new one. - scoped_refptr<DatabaseTracker> tracker( - new DatabaseTracker(temp_dir.path(), false, NULL, NULL, NULL)); - - // Get all data for all origins. - std::vector<OriginInfo> origins_info; - EXPECT_TRUE(tracker->GetAllOriginsInfo(&origins_info)); - // kOrigin1 was not session-only, so it survived. kOrigin2 was session-only - // and it got deleted. - EXPECT_EQ(size_t(1), origins_info.size()); - EXPECT_EQ(kOrigin1, origins_info[0].GetOriginIdentifier()); - EXPECT_TRUE( - base::PathExists(tracker->GetFullDBFilePath(kOrigin1, kDB1))); - EXPECT_EQ(base::FilePath(), tracker->GetFullDBFilePath(kOrigin2, kDB2)); - - // The origin directory of kOrigin1 remains, but the origin directory of - // kOrigin2 is deleted. - EXPECT_TRUE(base::PathExists(origin1_db_dir)); - EXPECT_FALSE(base::PathExists(origin2_db_dir)); - } - - static void DatabaseTrackerSetForceKeepSessionState() { - int64 database_size = 0; - const std::string kOrigin1 = - webkit_database::GetIdentifierFromOrigin(GURL(kOrigin1Url)); - const std::string kOrigin2 = - webkit_database::GetIdentifierFromOrigin(GURL(kOrigin2Url)); - const base::string16 kDB1 = ASCIIToUTF16("db1"); - const base::string16 kDB2 = ASCIIToUTF16("db2"); - const base::string16 kDescription = ASCIIToUTF16("database_description"); - - // Initialize the tracker database. - base::MessageLoop message_loop; - base::ScopedTempDir temp_dir; - ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); - base::FilePath origin1_db_dir; - base::FilePath origin2_db_dir; - { - scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy = - new quota::MockSpecialStoragePolicy; - special_storage_policy->AddSessionOnly(GURL(kOrigin2Url)); - scoped_refptr<DatabaseTracker> tracker( - new DatabaseTracker(temp_dir.path(), - false, - special_storage_policy.get(), - NULL, - base::MessageLoopProxy::current().get())); - tracker->SetForceKeepSessionState(); - - // Open two new databases. - tracker->DatabaseOpened(kOrigin1, kDB1, kDescription, 0, - &database_size); - EXPECT_EQ(0, database_size); - tracker->DatabaseOpened(kOrigin2, kDB2, kDescription, 0, - &database_size); - EXPECT_EQ(0, database_size); - - // Write some data to each file. - base::FilePath db_file; - db_file = tracker->GetFullDBFilePath(kOrigin1, kDB1); - EXPECT_TRUE(base::CreateDirectory(db_file.DirName())); - EXPECT_TRUE(EnsureFileOfSize(db_file, 1)); - - db_file = tracker->GetFullDBFilePath(kOrigin2, kDB2); - EXPECT_TRUE(base::CreateDirectory(db_file.DirName())); - EXPECT_TRUE(EnsureFileOfSize(db_file, 2)); - - // Store the origin database directories as long as they still exist. - origin1_db_dir = tracker->GetFullDBFilePath(kOrigin1, kDB1).DirName(); - origin2_db_dir = tracker->GetFullDBFilePath(kOrigin2, kDB2).DirName(); - - tracker->DatabaseModified(kOrigin1, kDB1); - tracker->DatabaseModified(kOrigin2, kDB2); - - // Close all databases. - tracker->DatabaseClosed(kOrigin1, kDB1); - tracker->DatabaseClosed(kOrigin2, kDB2); - - tracker->Shutdown(); - } - - // At this point, the database tracker should be gone. Create a new one. - scoped_refptr<DatabaseTracker> tracker( - new DatabaseTracker(temp_dir.path(), false, NULL, NULL, NULL)); - - // Get all data for all origins. - std::vector<OriginInfo> origins_info; - EXPECT_TRUE(tracker->GetAllOriginsInfo(&origins_info)); - // No origins were deleted. - EXPECT_EQ(size_t(2), origins_info.size()); - EXPECT_TRUE( - base::PathExists(tracker->GetFullDBFilePath(kOrigin1, kDB1))); - EXPECT_TRUE( - base::PathExists(tracker->GetFullDBFilePath(kOrigin2, kDB2))); - - EXPECT_TRUE(base::PathExists(origin1_db_dir)); - EXPECT_TRUE(base::PathExists(origin2_db_dir)); - } - - static void EmptyDatabaseNameIsValid() { - const GURL kOrigin(kOrigin1Url); - const std::string kOriginId = - webkit_database::GetIdentifierFromOrigin(kOrigin); - const base::string16 kEmptyName; - const base::string16 kDescription(ASCIIToUTF16("description")); - const base::string16 kChangedDescription( - ASCIIToUTF16("changed_description")); - - // Initialize a tracker database, no need to put it on disk. - const bool kUseInMemoryTrackerDatabase = true; - base::ScopedTempDir temp_dir; - ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); - scoped_refptr<DatabaseTracker> tracker( - new DatabaseTracker(temp_dir.path(), kUseInMemoryTrackerDatabase, - NULL, NULL, NULL)); - - // Starts off with no databases. - std::vector<OriginInfo> infos; - EXPECT_TRUE(tracker->GetAllOriginsInfo(&infos)); - EXPECT_TRUE(infos.empty()); - - // Create a db with an empty name. - int64 database_size = -1; - tracker->DatabaseOpened(kOriginId, kEmptyName, kDescription, 0, - &database_size); - EXPECT_EQ(0, database_size); - tracker->DatabaseModified(kOriginId, kEmptyName); - EXPECT_TRUE(tracker->GetAllOriginsInfo(&infos)); - EXPECT_EQ(1u, infos.size()); - EXPECT_EQ(kDescription, infos[0].GetDatabaseDescription(kEmptyName)); - EXPECT_FALSE(tracker->GetFullDBFilePath(kOriginId, kEmptyName).empty()); - tracker->DatabaseOpened(kOriginId, kEmptyName, kChangedDescription, 0, - &database_size); - infos.clear(); - EXPECT_TRUE(tracker->GetAllOriginsInfo(&infos)); - EXPECT_EQ(1u, infos.size()); - EXPECT_EQ(kChangedDescription, infos[0].GetDatabaseDescription(kEmptyName)); - tracker->DatabaseClosed(kOriginId, kEmptyName); - tracker->DatabaseClosed(kOriginId, kEmptyName); - - // Deleting it should return to the initial state. - EXPECT_EQ(net::OK, tracker->DeleteDatabase(kOriginId, kEmptyName, - net::CompletionCallback())); - infos.clear(); - EXPECT_TRUE(tracker->GetAllOriginsInfo(&infos)); - EXPECT_TRUE(infos.empty()); - } - - static void HandleSqliteError() { - const GURL kOrigin(kOrigin1Url); - const std::string kOriginId = - webkit_database::GetIdentifierFromOrigin(kOrigin); - const base::string16 kName(ASCIIToUTF16("name")); - const base::string16 kDescription(ASCIIToUTF16("description")); - - // Initialize a tracker database, no need to put it on disk. - const bool kUseInMemoryTrackerDatabase = true; - base::ScopedTempDir temp_dir; - ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); - scoped_refptr<DatabaseTracker> tracker( - new DatabaseTracker(temp_dir.path(), kUseInMemoryTrackerDatabase, - NULL, NULL, NULL)); - - // Setup to observe OnScheduledForDelete notifications. - TestObserver observer(false, true); - tracker->AddObserver(&observer); - - // Verify does no harm when there is no such database. - tracker->HandleSqliteError(kOriginId, kName, SQLITE_CORRUPT); - EXPECT_FALSE(tracker->IsDatabaseScheduledForDeletion(kOriginId, kName)); - EXPECT_FALSE(observer.DidReceiveNewNotification()); - - // -------------------------------------------------------- - // Create a record of a database in the tracker db and create - // a spoof_db_file on disk in the expected location. - int64 database_size = 0; - tracker->DatabaseOpened(kOriginId, kName, kDescription, 0, - &database_size); - base::FilePath spoof_db_file = tracker->GetFullDBFilePath(kOriginId, kName); - EXPECT_FALSE(tracker->GetFullDBFilePath(kOriginId, kName).empty()); - EXPECT_TRUE(base::CreateDirectory(spoof_db_file.DirName())); - EXPECT_TRUE(EnsureFileOfSize(spoof_db_file, 1)); - - // Verify does no harm with a non-error is reported. - tracker->HandleSqliteError(kOriginId, kName, SQLITE_OK); - EXPECT_FALSE(tracker->IsDatabaseScheduledForDeletion(kOriginId, kName)); - EXPECT_FALSE(observer.DidReceiveNewNotification()); - - // Verify that with a connection open, the db is scheduled for deletion, - // but that the file still exists. - tracker->HandleSqliteError(kOriginId, kName, SQLITE_CORRUPT); - EXPECT_TRUE(tracker->IsDatabaseScheduledForDeletion(kOriginId, kName)); - EXPECT_TRUE(observer.DidReceiveNewNotification()); - EXPECT_TRUE(base::PathExists(spoof_db_file)); - - // Verify that once closed, the file is deleted and the record in the - // tracker db is removed. - tracker->DatabaseClosed(kOriginId, kName); - EXPECT_FALSE(base::PathExists(spoof_db_file)); - EXPECT_TRUE(tracker->GetFullDBFilePath(kOriginId, kName).empty()); - - // -------------------------------------------------------- - // Create another record of a database in the tracker db and create - // a spoof_db_file on disk in the expected location. - tracker->DatabaseOpened(kOriginId, kName, kDescription, 0, - &database_size); - base::FilePath spoof_db_file2 = tracker->GetFullDBFilePath(kOriginId, kName); - EXPECT_FALSE(tracker->GetFullDBFilePath(kOriginId, kName).empty()); - EXPECT_NE(spoof_db_file, spoof_db_file2); - EXPECT_TRUE(base::CreateDirectory(spoof_db_file2.DirName())); - EXPECT_TRUE(EnsureFileOfSize(spoof_db_file2, 1)); - - // Verify that with no connection open, the db is deleted immediately. - tracker->DatabaseClosed(kOriginId, kName); - tracker->HandleSqliteError(kOriginId, kName, SQLITE_CORRUPT); - EXPECT_FALSE(tracker->IsDatabaseScheduledForDeletion(kOriginId, kName)); - EXPECT_FALSE(observer.DidReceiveNewNotification()); - EXPECT_TRUE(tracker->GetFullDBFilePath(kOriginId, kName).empty()); - EXPECT_FALSE(base::PathExists(spoof_db_file2)); - - tracker->RemoveObserver(&observer); - } -}; - -TEST(DatabaseTrackerTest, DeleteOpenDatabase) { - DatabaseTracker_TestHelper_Test::TestDeleteOpenDatabase(false); -} - -TEST(DatabaseTrackerTest, DeleteOpenDatabaseIncognitoMode) { - DatabaseTracker_TestHelper_Test::TestDeleteOpenDatabase(true); -} - -TEST(DatabaseTrackerTest, DatabaseTracker) { - DatabaseTracker_TestHelper_Test::TestDatabaseTracker(false); -} - -TEST(DatabaseTrackerTest, DatabaseTrackerIncognitoMode) { - DatabaseTracker_TestHelper_Test::TestDatabaseTracker(true); -} - -TEST(DatabaseTrackerTest, DatabaseTrackerQuotaIntegration) { - // There is no difference in behavior between incognito and not. - DatabaseTracker_TestHelper_Test::DatabaseTrackerQuotaIntegration(); -} - -TEST(DatabaseTrackerTest, DatabaseTrackerClearSessionOnlyDatabasesOnExit) { - // Only works for regular mode. - DatabaseTracker_TestHelper_Test:: - DatabaseTrackerClearSessionOnlyDatabasesOnExit(); -} - -TEST(DatabaseTrackerTest, DatabaseTrackerSetForceKeepSessionState) { - // Only works for regular mode. - DatabaseTracker_TestHelper_Test::DatabaseTrackerSetForceKeepSessionState(); -} - -TEST(DatabaseTrackerTest, EmptyDatabaseNameIsValid) { - DatabaseTracker_TestHelper_Test::EmptyDatabaseNameIsValid(); -} - -TEST(DatabaseTrackerTest, HandleSqliteError) { - DatabaseTracker_TestHelper_Test::HandleSqliteError(); -} - -} // namespace webkit_database diff --git a/webkit/browser/quota/mock_special_storage_policy.cc b/webkit/browser/quota/mock_special_storage_policy.cc deleted file mode 100644 index 027a35d..0000000 --- a/webkit/browser/quota/mock_special_storage_policy.cc +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2013 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 "webkit/browser/quota/mock_special_storage_policy.h" - -#include "base/stl_util.h" - -namespace quota { - -MockSpecialStoragePolicy::MockSpecialStoragePolicy() - : all_unlimited_(false) { -} - -bool MockSpecialStoragePolicy::IsStorageProtected(const GURL& origin) { - return ContainsKey(protected_, origin); -} - -bool MockSpecialStoragePolicy::IsStorageUnlimited(const GURL& origin) { - if (all_unlimited_) - return true; - return ContainsKey(unlimited_, origin); -} - -bool MockSpecialStoragePolicy::IsStorageSessionOnly(const GURL& origin) { - return ContainsKey(session_only_, origin); -} - -bool MockSpecialStoragePolicy::CanQueryDiskSize(const GURL& origin) { - return ContainsKey(can_query_disk_size_, origin); -} - -bool MockSpecialStoragePolicy::IsFileHandler(const std::string& extension_id) { - return ContainsKey(file_handlers_, extension_id); -} - -bool MockSpecialStoragePolicy::HasIsolatedStorage(const GURL& origin) { - return ContainsKey(isolated_, origin); -} - -bool MockSpecialStoragePolicy::HasSessionOnlyOrigins() { - return !session_only_.empty(); -} - -MockSpecialStoragePolicy::~MockSpecialStoragePolicy() {} - -} // namespace quota diff --git a/webkit/browser/quota/mock_special_storage_policy.h b/webkit/browser/quota/mock_special_storage_policy.h deleted file mode 100644 index 80f64bc..0000000 --- a/webkit/browser/quota/mock_special_storage_policy.h +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright 2013 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. - -#ifndef WEBKIT_BROWSER_QUOTA_MOCK_SPECIAL_STORAGE_POLICY_H_ -#define WEBKIT_BROWSER_QUOTA_MOCK_SPECIAL_STORAGE_POLICY_H_ - -#include <set> -#include <string> - -#include "url/gurl.h" -#include "webkit/browser/quota/special_storage_policy.h" - -namespace quota { - -class MockSpecialStoragePolicy : public quota::SpecialStoragePolicy { - public: - MockSpecialStoragePolicy(); - - virtual bool IsStorageProtected(const GURL& origin) OVERRIDE; - virtual bool IsStorageUnlimited(const GURL& origin) OVERRIDE; - virtual bool IsStorageSessionOnly(const GURL& origin) OVERRIDE; - virtual bool CanQueryDiskSize(const GURL& origin) OVERRIDE; - virtual bool IsFileHandler(const std::string& extension_id) OVERRIDE; - virtual bool HasIsolatedStorage(const GURL& origin) OVERRIDE; - virtual bool HasSessionOnlyOrigins() OVERRIDE; - - void AddProtected(const GURL& origin) { - protected_.insert(origin); - } - - void AddUnlimited(const GURL& origin) { - unlimited_.insert(origin); - } - - void RemoveUnlimited(const GURL& origin) { - unlimited_.erase(origin); - } - - void AddSessionOnly(const GURL& origin) { - session_only_.insert(origin); - } - - void GrantQueryDiskSize(const GURL& origin) { - can_query_disk_size_.insert(origin); - } - - void AddFileHandler(const std::string& id) { - file_handlers_.insert(id); - } - - void AddIsolated(const GURL& origin) { - isolated_.insert(origin); - } - - void RemoveIsolated(const GURL& origin) { - isolated_.erase(origin); - } - - void SetAllUnlimited(bool all_unlimited) { - all_unlimited_ = all_unlimited; - } - - void Reset() { - protected_.clear(); - unlimited_.clear(); - session_only_.clear(); - can_query_disk_size_.clear(); - file_handlers_.clear(); - isolated_.clear(); - all_unlimited_ = false; - } - - void NotifyGranted(const GURL& origin, int change_flags) { - SpecialStoragePolicy::NotifyGranted(origin, change_flags); - } - - void NotifyRevoked(const GURL& origin, int change_flags) { - SpecialStoragePolicy::NotifyRevoked(origin, change_flags); - } - - void NotifyCleared() { - SpecialStoragePolicy::NotifyCleared(); - } - - protected: - virtual ~MockSpecialStoragePolicy(); - - private: - std::set<GURL> protected_; - std::set<GURL> unlimited_; - std::set<GURL> session_only_; - std::set<GURL> can_query_disk_size_; - std::set<GURL> isolated_; - std::set<std::string> file_handlers_; - - bool all_unlimited_; -}; -} // namespace quota - -#endif // WEBKIT_BROWSER_QUOTA_MOCK_SPECIAL_STORAGE_POLICY_H_ |