Index: chrome/browser/cookies_tree_model_unittest.cc |
diff --git a/chrome/browser/cookies_tree_model_unittest.cc b/chrome/browser/cookies_tree_model_unittest.cc |
index 2ce762e99e9e6a1b655d0a95011c3b802ba4db4c..22bafa0f0a4413d93aad7bb07877c2c2866e5195 100644 |
--- a/chrome/browser/cookies_tree_model_unittest.cc |
+++ b/chrome/browser/cookies_tree_model_unittest.cc |
@@ -12,6 +12,7 @@ |
#include "chrome/browser/mock_browsing_data_database_helper.h" |
#include "chrome/browser/mock_browsing_data_file_system_helper.h" |
#include "chrome/browser/mock_browsing_data_indexed_db_helper.h" |
+#include "chrome/browser/mock_browsing_data_quota_helper.h" |
#include "chrome/browser/mock_browsing_data_local_storage_helper.h" |
#include "chrome/test/testing_profile.h" |
#include "content/common/content_notification_types.h" |
@@ -50,6 +51,8 @@ class CookiesTreeModelTest : public testing::Test { |
new MockBrowsingDataIndexedDBHelper(profile_.get()); |
mock_browsing_data_file_system_helper_ = |
new MockBrowsingDataFileSystemHelper(profile_.get()); |
+ mock_browsing_data_quota_helper_ = |
+ new MockBrowsingDataQuotaHelper(profile_.get()); |
} |
CookiesTreeModel* CreateCookiesTreeModelWithInitialSample() { |
@@ -64,6 +67,7 @@ class CookiesTreeModelTest : public testing::Test { |
mock_browsing_data_appcache_helper_, |
mock_browsing_data_indexed_db_helper_, |
mock_browsing_data_file_system_helper_, |
+ mock_browsing_data_quota_helper_, |
false); |
mock_browsing_data_database_helper_->AddDatabaseSamples(); |
mock_browsing_data_database_helper_->Notify(); |
@@ -75,6 +79,7 @@ class CookiesTreeModelTest : public testing::Test { |
mock_browsing_data_indexed_db_helper_->Notify(); |
mock_browsing_data_file_system_helper_->AddFileSystemSamples(); |
mock_browsing_data_file_system_helper_->Notify(); |
+ mock_browsing_data_quota_helper_->Notify(); |
{ |
SCOPED_TRACE("Initial State 3 cookies, 2 databases, 2 local storages, " |
"2 session storages, 2 indexed DBs, 3 filesystems"); |
@@ -258,6 +263,8 @@ class CookiesTreeModelTest : public testing::Test { |
mock_browsing_data_indexed_db_helper_; |
scoped_refptr<MockBrowsingDataFileSystemHelper> |
mock_browsing_data_file_system_helper_; |
+ scoped_refptr<MockBrowsingDataQuotaHelper> |
+ mock_browsing_data_quota_helper_; |
}; |
TEST_F(CookiesTreeModelTest, RemoveAll) { |
@@ -640,6 +647,7 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) { |
mock_browsing_data_appcache_helper_, |
mock_browsing_data_indexed_db_helper_, |
mock_browsing_data_file_system_helper_, |
+ mock_browsing_data_quota_helper_, |
false); |
mock_browsing_data_database_helper_->AddDatabaseSamples(); |
mock_browsing_data_database_helper_->Notify(); |
@@ -651,6 +659,7 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) { |
mock_browsing_data_indexed_db_helper_->Notify(); |
mock_browsing_data_file_system_helper_->AddFileSystemSamples(); |
mock_browsing_data_file_system_helper_->Notify(); |
+ mock_browsing_data_quota_helper_->Notify(); |
{ |
SCOPED_TRACE("Initial State 4 cookies, 2 databases, 2 local storages, " |
@@ -711,6 +720,7 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) { |
mock_browsing_data_appcache_helper_, |
mock_browsing_data_indexed_db_helper_, |
mock_browsing_data_file_system_helper_, |
+ mock_browsing_data_quota_helper_, |
false); |
mock_browsing_data_database_helper_->AddDatabaseSamples(); |
mock_browsing_data_database_helper_->Notify(); |
@@ -784,6 +794,7 @@ TEST_F(CookiesTreeModelTest, RemoveSecondOrigin) { |
mock_browsing_data_appcache_helper_, |
mock_browsing_data_indexed_db_helper_, |
mock_browsing_data_file_system_helper_, |
+ mock_browsing_data_quota_helper_, |
false); |
{ |
SCOPED_TRACE("Initial State 5 cookies"); |
@@ -822,6 +833,7 @@ TEST_F(CookiesTreeModelTest, OriginOrdering) { |
new MockBrowsingDataAppCacheHelper(profile_.get()), |
new MockBrowsingDataIndexedDBHelper(profile_.get()), |
new MockBrowsingDataFileSystemHelper(profile_.get()), |
+ new MockBrowsingDataQuotaHelper(profile_.get()), |
false); |
{ |
@@ -851,6 +863,7 @@ TEST_F(CookiesTreeModelTest, ContentSettings) { |
new MockBrowsingDataAppCacheHelper(profile_.get()), |
new MockBrowsingDataIndexedDBHelper(profile_.get()), |
new MockBrowsingDataFileSystemHelper(profile_.get()), |
+ new MockBrowsingDataQuotaHelper(profile_.get()), |
false); |
TestingProfile profile; |