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 f1c47d5f90fe478b98a03084b6a6119b034d109d..52f4d1e9fb0e69fa9379817a12cd63ea14d65317 100644 |
--- a/chrome/browser/cookies_tree_model_unittest.cc |
+++ b/chrome/browser/cookies_tree_model_unittest.cc |
@@ -10,6 +10,7 @@ |
#include "chrome/browser/content_settings/cookie_settings.h" |
#include "chrome/browser/content_settings/host_content_settings_map.h" |
#include "chrome/browser/content_settings/mock_settings_observer.h" |
+#include "chrome/browser/extensions/extension_special_storage_policy.h" |
#include "chrome/browser/mock_browsing_data_appcache_helper.h" |
#include "chrome/browser/mock_browsing_data_cookie_helper.h" |
#include "chrome/browser/mock_browsing_data_database_helper.h" |
@@ -43,6 +44,7 @@ class CookiesTreeModelTest : public testing::Test { |
virtual ~CookiesTreeModelTest() { |
// Avoid memory leaks. |
+ special_storage_policy_ = NULL; |
profile_.reset(); |
message_loop_.RunAllPending(); |
} |
@@ -68,6 +70,11 @@ class CookiesTreeModelTest : public testing::Test { |
new MockBrowsingDataQuotaHelper(profile_.get()); |
mock_browsing_data_server_bound_cert_helper_ = |
new MockBrowsingDataServerBoundCertHelper(); |
+ scoped_refptr<CookieSettings> cookie_settings = |
+ new CookieSettings(profile_->GetHostContentSettingsMap(), |
+ profile_->GetPrefs()); |
+ special_storage_policy_ = |
+ new ExtensionSpecialStoragePolicy(cookie_settings); |
} |
virtual void TearDown() OVERRIDE { |
@@ -82,7 +89,7 @@ class CookiesTreeModelTest : public testing::Test { |
message_loop_.RunAllPending(); |
} |
- CookiesTreeModel* CreateCookiesTreeModelWithInitialSample() { |
+ scoped_ptr<CookiesTreeModel> CreateCookiesTreeModelWithInitialSample() { |
CookiesTreeModel* cookies_model = new CookiesTreeModel( |
mock_browsing_data_cookie_helper_, |
mock_browsing_data_database_helper_, |
@@ -93,6 +100,7 @@ class CookiesTreeModelTest : public testing::Test { |
mock_browsing_data_file_system_helper_, |
mock_browsing_data_quota_helper_, |
mock_browsing_data_server_bound_cert_helper_, |
+ special_storage_policy_, |
false); |
mock_browsing_data_cookie_helper_-> |
AddCookieSamples(GURL("http://foo1"), "A=1"); |
@@ -154,7 +162,7 @@ class CookiesTreeModelTest : public testing::Test { |
EXPECT_EQ("sbc1,sbc2", |
GetDisplayedServerBoundCerts(cookies_model)); |
} |
- return cookies_model; |
+ return make_scoped_ptr(cookies_model); |
} |
std::string GetNodesOfChildren( |
@@ -166,39 +174,38 @@ class CookiesTreeModelTest : public testing::Test { |
retval += GetNodesOfChildren(node->GetChild(i), node_type); |
} |
return retval; |
- } else { |
- if (node->GetDetailedInfo().node_type == node_type) { |
- switch (node_type) { |
- case CookieTreeNode::DetailedInfo::TYPE_SESSION_STORAGE: |
- return node->GetDetailedInfo(). |
- session_storage_info->origin_url.spec() + ","; |
- case CookieTreeNode::DetailedInfo::TYPE_LOCAL_STORAGE: |
- return node->GetDetailedInfo(). |
- local_storage_info->origin_url.spec() + ","; |
- case CookieTreeNode::DetailedInfo::TYPE_DATABASE: |
- return node->GetDetailedInfo().database_info->database_name + ","; |
- case CookieTreeNode::DetailedInfo::TYPE_COOKIE: |
- return node->GetDetailedInfo().cookie->Name() + ","; |
- case CookieTreeNode::DetailedInfo::TYPE_APPCACHE: |
- return node->GetDetailedInfo().appcache_info->manifest_url.spec() + |
- ","; |
- case CookieTreeNode::DetailedInfo::TYPE_INDEXED_DB: |
- return node->GetDetailedInfo().indexed_db_info->origin.spec() + |
- ","; |
- case CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM: |
- return node->GetDetailedInfo().file_system_info->origin.spec() + |
- ","; |
- case CookieTreeNode::DetailedInfo::TYPE_QUOTA: |
- return node->GetDetailedInfo().quota_info->host + ","; |
- case CookieTreeNode::DetailedInfo::TYPE_SERVER_BOUND_CERT: |
- return node->GetDetailedInfo( |
- ).server_bound_cert->server_identifier() + ","; |
- default: |
- return ""; |
- } |
- } else { |
- return ""; |
- } |
+ } |
+ |
+ if (node->GetDetailedInfo().node_type != node_type) |
+ return std::string(); |
+ |
+ switch (node_type) { |
+ case CookieTreeNode::DetailedInfo::TYPE_SESSION_STORAGE: |
+ return node->GetDetailedInfo(). |
+ session_storage_info->origin_url.spec() + ","; |
+ case CookieTreeNode::DetailedInfo::TYPE_LOCAL_STORAGE: |
+ return node->GetDetailedInfo(). |
+ local_storage_info->origin_url.spec() + ","; |
+ case CookieTreeNode::DetailedInfo::TYPE_DATABASE: |
+ return node->GetDetailedInfo().database_info->database_name + ","; |
+ case CookieTreeNode::DetailedInfo::TYPE_COOKIE: |
+ return node->GetDetailedInfo().cookie->Name() + ","; |
+ case CookieTreeNode::DetailedInfo::TYPE_APPCACHE: |
+ return node->GetDetailedInfo().appcache_info->manifest_url.spec() + |
+ ","; |
+ case CookieTreeNode::DetailedInfo::TYPE_INDEXED_DB: |
+ return node->GetDetailedInfo().indexed_db_info->origin.spec() + |
+ ","; |
+ case CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM: |
+ return node->GetDetailedInfo().file_system_info->origin.spec() + |
+ ","; |
+ case CookieTreeNode::DetailedInfo::TYPE_QUOTA: |
+ return node->GetDetailedInfo().quota_info->host + ","; |
+ case CookieTreeNode::DetailedInfo::TYPE_SERVER_BOUND_CERT: |
+ return node->GetDetailedInfo( |
+ ).server_bound_cert->server_identifier() + ","; |
+ default: |
+ return std::string(); |
} |
} |
@@ -327,6 +334,7 @@ class CookiesTreeModelTest : public testing::Test { |
mock_browsing_data_quota_helper_; |
scoped_refptr<MockBrowsingDataServerBoundCertHelper> |
mock_browsing_data_server_bound_cert_helper_; |
+ scoped_refptr<ExtensionSpecialStoragePolicy> special_storage_policy_; |
}; |
TEST_F(CookiesTreeModelTest, RemoveAll) { |
@@ -365,7 +373,7 @@ TEST_F(CookiesTreeModelTest, RemoveAll) { |
// Make sure the nodes are also deleted from the model's cache. |
// http://crbug.com/43249 |
- cookies_model->UpdateSearchResults(std::wstring()); |
+ cookies_model->UpdateSearchResults(string16()); |
{ |
SCOPED_TRACE("After removing"); |
@@ -783,6 +791,7 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) { |
mock_browsing_data_file_system_helper_, |
mock_browsing_data_quota_helper_, |
mock_browsing_data_server_bound_cert_helper_, |
+ special_storage_policy_, |
false); |
mock_browsing_data_cookie_helper_-> |
AddCookieSamples(GURL("http://foo1"), "A=1"); |
@@ -864,6 +873,7 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) { |
mock_browsing_data_file_system_helper_, |
mock_browsing_data_quota_helper_, |
mock_browsing_data_server_bound_cert_helper_, |
+ special_storage_policy_, |
false); |
mock_browsing_data_cookie_helper_-> |
AddCookieSamples(GURL("http://foo1"), "A=1"); |
@@ -949,6 +959,7 @@ TEST_F(CookiesTreeModelTest, RemoveSecondOrigin) { |
mock_browsing_data_file_system_helper_, |
mock_browsing_data_quota_helper_, |
mock_browsing_data_server_bound_cert_helper_, |
+ special_storage_policy_, |
false); |
mock_browsing_data_cookie_helper_-> |
AddCookieSamples(GURL("http://foo1"), "A=1"); |
@@ -988,6 +999,7 @@ TEST_F(CookiesTreeModelTest, OriginOrdering) { |
mock_browsing_data_file_system_helper_, |
mock_browsing_data_quota_helper_, |
mock_browsing_data_server_bound_cert_helper_, |
+ special_storage_policy_, |
false); |
mock_browsing_data_cookie_helper_-> |
AddCookieSamples(GURL("http://a.foo2.com"), "A=1"); |
@@ -1031,6 +1043,7 @@ TEST_F(CookiesTreeModelTest, ContentSettings) { |
mock_browsing_data_file_system_helper_, |
mock_browsing_data_quota_helper_, |
mock_browsing_data_server_bound_cert_helper_, |
+ special_storage_policy_, |
false); |
mock_browsing_data_cookie_helper_->AddCookieSamples(host, "A=1"); |
mock_browsing_data_cookie_helper_->Notify(); |
@@ -1044,7 +1057,7 @@ TEST_F(CookiesTreeModelTest, ContentSettings) { |
CookieTreeRootNode* root = |
static_cast<CookieTreeRootNode*>(cookies_model.GetRoot()); |
- CookieTreeOriginNode* origin = root->GetOrCreateOriginNode(host); |
+ CookieTreeHostNode* origin = root->GetOrCreateHostNode(host); |
EXPECT_EQ(1, origin->child_count()); |
EXPECT_TRUE(origin->CanCreateContentException()); |
@@ -1073,19 +1086,19 @@ TEST_F(CookiesTreeModelTest, FileSystemFilter) { |
scoped_ptr<CookiesTreeModel> cookies_model( |
CreateCookiesTreeModelWithInitialSample()); |
- cookies_model->UpdateSearchResults(std::wstring(L"fshost1")); |
+ cookies_model->UpdateSearchResults(ASCIIToUTF16("fshost1")); |
EXPECT_EQ("http://fshost1:1/", |
GetDisplayedFileSystems(cookies_model.get())); |
- cookies_model->UpdateSearchResults(std::wstring(L"fshost2")); |
+ cookies_model->UpdateSearchResults(ASCIIToUTF16("fshost2")); |
EXPECT_EQ("http://fshost2:2/", |
GetDisplayedFileSystems(cookies_model.get())); |
- cookies_model->UpdateSearchResults(std::wstring(L"fshost3")); |
+ cookies_model->UpdateSearchResults(ASCIIToUTF16("fshost3")); |
EXPECT_EQ("http://fshost3:3/", |
GetDisplayedFileSystems(cookies_model.get())); |
- cookies_model->UpdateSearchResults(std::wstring()); |
+ cookies_model->UpdateSearchResults(string16()); |
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/", |
GetDisplayedFileSystems(cookies_model.get())); |
} |