| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/cookies_tree_model.h" | 5 #include "chrome/browser/cookies_tree_model.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "chrome/browser/content_settings/host_content_settings_map.h" | 9 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 10 #include "chrome/browser/content_settings/mock_settings_observer.h" | 10 #include "chrome/browser/content_settings/mock_settings_observer.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 new MockBrowsingDataCookieHelper(profile_.get()); | 45 new MockBrowsingDataCookieHelper(profile_.get()); |
| 46 mock_browsing_data_database_helper_ = | 46 mock_browsing_data_database_helper_ = |
| 47 new MockBrowsingDataDatabaseHelper(profile_.get()); | 47 new MockBrowsingDataDatabaseHelper(profile_.get()); |
| 48 mock_browsing_data_local_storage_helper_ = | 48 mock_browsing_data_local_storage_helper_ = |
| 49 new MockBrowsingDataLocalStorageHelper(profile_.get()); | 49 new MockBrowsingDataLocalStorageHelper(profile_.get()); |
| 50 mock_browsing_data_session_storage_helper_ = | 50 mock_browsing_data_session_storage_helper_ = |
| 51 new MockBrowsingDataLocalStorageHelper(profile_.get()); | 51 new MockBrowsingDataLocalStorageHelper(profile_.get()); |
| 52 mock_browsing_data_appcache_helper_ = | 52 mock_browsing_data_appcache_helper_ = |
| 53 new MockBrowsingDataAppCacheHelper(profile_.get()); | 53 new MockBrowsingDataAppCacheHelper(profile_.get()); |
| 54 mock_browsing_data_indexed_db_helper_ = | 54 mock_browsing_data_indexed_db_helper_ = |
| 55 new MockBrowsingDataIndexedDBHelper(profile_.get()); | 55 new MockBrowsingDataIndexedDBHelper(); |
| 56 mock_browsing_data_file_system_helper_ = | 56 mock_browsing_data_file_system_helper_ = |
| 57 new MockBrowsingDataFileSystemHelper(profile_.get()); | 57 new MockBrowsingDataFileSystemHelper(profile_.get()); |
| 58 mock_browsing_data_quota_helper_ = | 58 mock_browsing_data_quota_helper_ = |
| 59 new MockBrowsingDataQuotaHelper(profile_.get()); | 59 new MockBrowsingDataQuotaHelper(profile_.get()); |
| 60 } | 60 } |
| 61 | 61 |
| 62 virtual void TearDown() OVERRIDE { | 62 virtual void TearDown() OVERRIDE { |
| 63 mock_browsing_data_quota_helper_ = NULL; | 63 mock_browsing_data_quota_helper_ = NULL; |
| 64 mock_browsing_data_file_system_helper_ = NULL; | 64 mock_browsing_data_file_system_helper_ = NULL; |
| 65 mock_browsing_data_indexed_db_helper_ = NULL; | 65 mock_browsing_data_indexed_db_helper_ = NULL; |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 case CookieTreeNode::DetailedInfo::TYPE_LOCAL_STORAGE: | 152 case CookieTreeNode::DetailedInfo::TYPE_LOCAL_STORAGE: |
| 153 return node->GetDetailedInfo().local_storage_info->origin + ","; | 153 return node->GetDetailedInfo().local_storage_info->origin + ","; |
| 154 case CookieTreeNode::DetailedInfo::TYPE_DATABASE: | 154 case CookieTreeNode::DetailedInfo::TYPE_DATABASE: |
| 155 return node->GetDetailedInfo().database_info->database_name + ","; | 155 return node->GetDetailedInfo().database_info->database_name + ","; |
| 156 case CookieTreeNode::DetailedInfo::TYPE_COOKIE: | 156 case CookieTreeNode::DetailedInfo::TYPE_COOKIE: |
| 157 return node->GetDetailedInfo().cookie->Name() + ","; | 157 return node->GetDetailedInfo().cookie->Name() + ","; |
| 158 case CookieTreeNode::DetailedInfo::TYPE_APPCACHE: | 158 case CookieTreeNode::DetailedInfo::TYPE_APPCACHE: |
| 159 return node->GetDetailedInfo().appcache_info->manifest_url.spec() + | 159 return node->GetDetailedInfo().appcache_info->manifest_url.spec() + |
| 160 ","; | 160 ","; |
| 161 case CookieTreeNode::DetailedInfo::TYPE_INDEXED_DB: | 161 case CookieTreeNode::DetailedInfo::TYPE_INDEXED_DB: |
| 162 return node->GetDetailedInfo().indexed_db_info->origin + ","; | 162 return node->GetDetailedInfo().indexed_db_info->origin_url.spec() + |
| 163 ","; |
| 163 case CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM: | 164 case CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM: |
| 164 return node->GetDetailedInfo().file_system_info->origin.spec() + | 165 return node->GetDetailedInfo().file_system_info->origin.spec() + |
| 165 ","; | 166 ","; |
| 166 case CookieTreeNode::DetailedInfo::TYPE_QUOTA: | 167 case CookieTreeNode::DetailedInfo::TYPE_QUOTA: |
| 167 return node->GetDetailedInfo().quota_info->host + ","; | 168 return node->GetDetailedInfo().quota_info->host + ","; |
| 168 default: | 169 default: |
| 169 return ""; | 170 return ""; |
| 170 } | 171 } |
| 171 } else { | 172 } else { |
| 172 return ""; | 173 return ""; |
| (...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 992 cookies_model->UpdateSearchResults(std::wstring(L"fshost3")); | 993 cookies_model->UpdateSearchResults(std::wstring(L"fshost3")); |
| 993 EXPECT_EQ("http://fshost3:3/", | 994 EXPECT_EQ("http://fshost3:3/", |
| 994 GetDisplayedFileSystems(cookies_model.get())); | 995 GetDisplayedFileSystems(cookies_model.get())); |
| 995 | 996 |
| 996 cookies_model->UpdateSearchResults(std::wstring()); | 997 cookies_model->UpdateSearchResults(std::wstring()); |
| 997 EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/", | 998 EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/", |
| 998 GetDisplayedFileSystems(cookies_model.get())); | 999 GetDisplayedFileSystems(cookies_model.get())); |
| 999 } | 1000 } |
| 1000 | 1001 |
| 1001 } // namespace | 1002 } // namespace |
| OLD | NEW |