| Index: chrome/browser/content_settings/local_shared_objects_container.cc
|
| diff --git a/chrome/browser/content_settings/local_shared_objects_container.cc b/chrome/browser/content_settings/local_shared_objects_container.cc
|
| index 84b66f280761f8b832785f3de0a13b7b3026016c..ad7830301f8d152bec6bd83b60d2958cb9784a43 100644
|
| --- a/chrome/browser/content_settings/local_shared_objects_container.cc
|
| +++ b/chrome/browser/content_settings/local_shared_objects_container.cc
|
| @@ -5,12 +5,12 @@
|
| #include "chrome/browser/content_settings/local_shared_objects_container.h"
|
|
|
| #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
|
| +#include "chrome/browser/browsing_data/browsing_data_channel_id_helper.h"
|
| #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
|
| #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
|
| #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
|
| #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
|
| #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
|
| -#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
|
| #include "chrome/browser/browsing_data/cookies_tree_model.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "content/public/browser/storage_partition.h"
|
| @@ -40,7 +40,7 @@ LocalSharedObjectsContainer::LocalSharedObjectsContainer(Profile* profile)
|
| content::BrowserContext::GetDefaultStoragePartition(profile)->
|
| GetIndexedDBContext())),
|
| local_storages_(new CannedBrowsingDataLocalStorageHelper(profile)),
|
| - server_bound_certs_(new CannedBrowsingDataServerBoundCertHelper()),
|
| + channel_ids_(new CannedBrowsingDataChannelIDHelper()),
|
| session_storages_(new CannedBrowsingDataLocalStorageHelper(profile)) {
|
| }
|
|
|
| @@ -54,7 +54,7 @@ void LocalSharedObjectsContainer::Reset() {
|
| file_systems_->Reset();
|
| indexed_dbs_->Reset();
|
| local_storages_->Reset();
|
| - server_bound_certs_->Reset();
|
| + channel_ids_->Reset();
|
| session_storages_->Reset();
|
| }
|
|
|
| @@ -66,7 +66,7 @@ size_t LocalSharedObjectsContainer::GetObjectCount() const {
|
| count += file_systems()->GetFileSystemCount();
|
| count += indexed_dbs()->GetIndexedDBCount();
|
| count += local_storages()->GetLocalStorageCount();
|
| - count += server_bound_certs()->GetCertCount();
|
| + count += channel_ids()->GetCertCount();
|
| count += session_storages()->GetLocalStorageCount();
|
| return count;
|
| }
|
| @@ -192,7 +192,7 @@ LocalSharedObjectsContainer::CreateCookiesTreeModel() const {
|
| indexed_dbs(),
|
| file_systems(),
|
| NULL,
|
| - server_bound_certs(),
|
| + channel_ids(),
|
| NULL);
|
|
|
| return make_scoped_ptr(new CookiesTreeModel(container, NULL, true));
|
|
|