chrome/browser/extensions/api/browsing_data/browsing_data_api.cc - Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name

Unified Diff: chrome/browser/extensions/api/browsing_data/browsing_data_api.cc

Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/content_settings/local_shared_objects_container.h ('K') | « chrome/browser/content_settings/local_shared_objects_container.cc ('k') | chrome/browser/extensions/api/browsing_data/browsing_data_test.cc » ('j') | chrome/browser/extensions/api/messaging/message_property_provider.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/browsing_data/browsing_data_api.cc

diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc

index b6987ae4957f8d5d49b2e5ec01069a26822bed7c..762885b5901580e7d8dd66f1c8ccd4f8f23a6f58 100644

--- a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc

+++ b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc

@@ -42,7 +42,7 @@ const char kFormDataKey[] = "formData";

const char kHistoryKey[] = "history";

const char kIndexedDBKey[] = "indexedDB";

const char kLocalStorageKey[] = "localStorage";

-const char kServerBoundCertsKey[] = "serverBoundCertificates";

+const char kChannelIDsKey[] = "serverBoundCertificates";

wtc 2014/07/01 19:50:49 I assume it may be unsafe to change the string lit

Ryan Hamilton 2014/07/21 19:12:05 Agreed.

const char kPasswordsKey[] = "passwords";

const char kPluginDataKey[] = "pluginData";

const char kWebSQLKey[] = "webSQL";

@@ -86,8 +86,8 @@ int MaskForKey(const char* key) {

if (strcmp(key, extension_browsing_data_api_constants::kLocalStorageKey) == 0)

return BrowsingDataRemover::REMOVE_LOCAL_STORAGE;

if (strcmp(key,

- extension_browsing_data_api_constants::kServerBoundCertsKey) == 0)

- return BrowsingDataRemover::REMOVE_SERVER_BOUND_CERTS;

+ extension_browsing_data_api_constants::kChannelIDsKey) == 0)

+ return BrowsingDataRemover::REMOVE_CHANNEL_IDS;

if (strcmp(key, extension_browsing_data_api_constants::kPasswordsKey) == 0)

return BrowsingDataRemover::REMOVE_PASSWORDS;

if (strcmp(key, extension_browsing_data_api_constants::kPluginDataKey) == 0)

@@ -171,7 +171,7 @@ bool BrowsingDataSettingsFunction::RunSync() {

extension_browsing_data_api_constants::kWebSQLKey,

delete_site_data);

SetDetails(selected.get(), permitted.get(),

- extension_browsing_data_api_constants::kServerBoundCertsKey,

+ extension_browsing_data_api_constants::kChannelIDsKey,

delete_site_data);

SetDetails(selected.get(), permitted.get(),

@@ -384,7 +384,7 @@ int BrowsingDataRemoveCacheFunction::GetRemovalMask() {

int BrowsingDataRemoveCookiesFunction::GetRemovalMask() {

return BrowsingDataRemover::REMOVE_COOKIES |

- BrowsingDataRemover::REMOVE_SERVER_BOUND_CERTS;

+ BrowsingDataRemover::REMOVE_CHANNEL_IDS;

}

int BrowsingDataRemoveDownloadsFunction::GetRemovalMask() {