Rename ServerBoundCert => ChannelID to reflect the current name

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Defines the Chrome Extensions BrowsingData API functions, which entail
 // clearing browsing data, and clearing the browser's cache (which, let's be
 // honest, are the same thing), as specified in the extension API JSON.
 
 #include "chrome/browser/extensions/api/browsing_data/browsing_data_api.h"
 
@@ skipping 24 matching lines @@
 // Type keys.
 const char kAppCacheKey[] = "appcache";
 const char kCacheKey[] = "cache";
 const char kCookiesKey[] = "cookies";
 const char kDownloadsKey[] = "downloads";
 const char kFileSystemsKey[] = "fileSystems";
 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 literal.

Nit: sort the kConstant names.

[Ryan Hamilton, 2014/07/21 19:12:05]

Agreed.
Done.

 const char kPasswordsKey[] = "passwords";
 const char kPluginDataKey[] = "pluginData";
 const char kWebSQLKey[] = "webSQL";
 
 // Option keys.
 const char kExtensionsKey[] = "extension";
 const char kOriginTypesKey[] = "originTypes";
 const char kProtectedWebKey[] = "protectedWeb";
 const char kSinceKey[] = "since";
 const char kUnprotectedWebKey[] = "unprotectedWeb";
@@ skipping 23 matching lines @@
     return BrowsingDataRemover::REMOVE_FILE_SYSTEMS;
   if (strcmp(key, extension_browsing_data_api_constants::kFormDataKey) == 0)
     return BrowsingDataRemover::REMOVE_FORM_DATA;
   if (strcmp(key, extension_browsing_data_api_constants::kHistoryKey) == 0)
     return BrowsingDataRemover::REMOVE_HISTORY;
   if (strcmp(key, extension_browsing_data_api_constants::kIndexedDBKey) == 0)
     return BrowsingDataRemover::REMOVE_INDEXEDDB;
   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)
     return BrowsingDataRemover::REMOVE_PLUGIN_DATA;
   if (strcmp(key, extension_browsing_data_api_constants::kWebSQLKey) == 0)
     return BrowsingDataRemover::REMOVE_WEBSQL;
 
   return 0;
 }
 
@@ skipping 63 matching lines @@
   SetDetails(selected.get(), permitted.get(),
              extension_browsing_data_api_constants::kIndexedDBKey,
              delete_site_data);
   SetDetails(selected.get(), permitted.get(),
       extension_browsing_data_api_constants::kLocalStorageKey,
       delete_site_data);
   SetDetails(selected.get(), permitted.get(),
              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(),
       extension_browsing_data_api_constants::kPluginDataKey,
       delete_site_data && prefs->GetBoolean(prefs::kClearPluginLSODataEnabled));
 
   SetDetails(selected.get(), permitted.get(),
              extension_browsing_data_api_constants::kHistoryKey,
              prefs->GetBoolean(prefs::kDeleteBrowsingHistory));
   SetDetails(selected.get(), permitted.get(),
@@ skipping 192 matching lines @@
 int BrowsingDataRemoveAppcacheFunction::GetRemovalMask() {
   return BrowsingDataRemover::REMOVE_APPCACHE;
 }
 
 int BrowsingDataRemoveCacheFunction::GetRemovalMask() {
   return BrowsingDataRemover::REMOVE_CACHE;
 }
 
 int BrowsingDataRemoveCookiesFunction::GetRemovalMask() {
   return BrowsingDataRemover::REMOVE_COOKIES |
-         BrowsingDataRemover::REMOVE_SERVER_BOUND_CERTS;
+         BrowsingDataRemover::REMOVE_CHANNEL_IDS;
 }
 
 int BrowsingDataRemoveDownloadsFunction::GetRemovalMask() {
   return BrowsingDataRemover::REMOVE_DOWNLOADS;
 }
 
 int BrowsingDataRemoveFileSystemsFunction::GetRemovalMask() {
   return BrowsingDataRemover::REMOVE_FILE_SYSTEMS;
 }
 
@@ skipping 17 matching lines @@
   return BrowsingDataRemover::REMOVE_PLUGIN_DATA;
 }
 
 int BrowsingDataRemovePasswordsFunction::GetRemovalMask() {
   return BrowsingDataRemover::REMOVE_PASSWORDS;
 }
 
 int BrowsingDataRemoveWebSQLFunction::GetRemovalMask() {
   return BrowsingDataRemover::REMOVE_WEBSQL;
 }