| Index: chrome/browser/ui/webui/options/cookies_view_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/cookies_view_handler.cc b/chrome/browser/ui/webui/options/cookies_view_handler.cc
|
| index ec0966f615852a449c7961a9b3d90c827043ada1..1012ef3ff145bfad3766172c63cfff9671774d2b 100644
|
| --- a/chrome/browser/ui/webui/options/cookies_view_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/cookies_view_handler.cc
|
| @@ -11,6 +11,7 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/values.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"
|
| @@ -18,7 +19,6 @@
|
| #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_quota_helper.h"
|
| -#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/webui/cookies_tree_model_util.h"
|
| #include "content/public/browser/browser_context.h"
|
| @@ -89,15 +89,15 @@ void CookiesViewHandler::GetLocalizedValues(
|
| IDS_COOKIES_FILE_SYSTEM_TEMPORARY_USAGE_LABEL },
|
| { "label_file_system_persistent_usage",
|
| IDS_COOKIES_FILE_SYSTEM_PERSISTENT_USAGE_LABEL },
|
| - { "cookie_server_bound_cert", IDS_COOKIES_SERVER_BOUND_CERT },
|
| - { "label_server_bound_cert_server_id",
|
| - IDS_COOKIES_SERVER_BOUND_CERT_ORIGIN_LABEL },
|
| - { "label_server_bound_cert_type",
|
| - IDS_COOKIES_SERVER_BOUND_CERT_TYPE_LABEL },
|
| - { "label_server_bound_cert_created",
|
| - IDS_COOKIES_SERVER_BOUND_CERT_CREATED_LABEL },
|
| - { "label_server_bound_cert_expires",
|
| - IDS_COOKIES_SERVER_BOUND_CERT_EXPIRES_LABEL },
|
| + { "cookie_channel_id", IDS_COOKIES_CHANNEL_ID },
|
| + { "label_channel_id_server_id",
|
| + IDS_COOKIES_CHANNEL_ID_ORIGIN_LABEL },
|
| + { "label_channel_id_type",
|
| + IDS_COOKIES_CHANNEL_ID_TYPE_LABEL },
|
| + { "label_channel_id_created",
|
| + IDS_COOKIES_CHANNEL_ID_CREATED_LABEL },
|
| + { "label_channel_id_expires",
|
| + IDS_COOKIES_CHANNEL_ID_EXPIRES_LABEL },
|
| { "label_protected_by_apps",
|
| IDS_GEOLOCATION_SET_BY_HOVER }, // TODO(bauerb): Use a better string
|
| };
|
| @@ -198,7 +198,7 @@ void CookiesViewHandler::EnsureCookiesTreeModelCreated() {
|
| new BrowsingDataIndexedDBHelper(indexed_db_context),
|
| BrowsingDataFileSystemHelper::Create(file_system_context),
|
| BrowsingDataQuotaHelper::Create(profile),
|
| - BrowsingDataServerBoundCertHelper::Create(profile),
|
| + BrowsingDataChannelIDHelper::Create(profile),
|
| BrowsingDataFlashLSOHelper::Create(profile));
|
| cookies_tree_model_.reset(
|
| new CookiesTreeModel(container,
|
|
|