Rename ServerBoundCert => ChannelID to reflect the current name

chrome/browser/ui/webui/options/cookies_view_handler.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.
 
 #include "chrome/browser/ui/webui/options/cookies_view_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #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"
 #include "chrome/browser/browsing_data/browsing_data_flash_lso_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_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"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 50 matching lines @@
     { "search_cookies", IDS_COOKIES_SEARCH_COOKIES },
     { "remove_cookie", IDS_COOKIES_REMOVE_LABEL },
     { "remove_all_cookie", IDS_COOKIES_REMOVE_ALL_LABEL },
     { "remove_all_shown_cookie", IDS_COOKIES_REMOVE_ALL_SHOWN_LABEL },
     { "cookie_file_system", IDS_COOKIES_FILE_SYSTEM },
     { "label_file_system_origin", IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL },
     { "label_file_system_temporary_usage",
       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
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterTitle(localized_strings, "cookiesViewPage",
                 IDS_COOKIES_WEBSITE_PERMISSIONS_WINDOW_TITLE);
 }
 
 void CookiesViewHandler::RegisterMessages() {
@@ skipping 80 matching lines @@
         storage_partition->GetFileSystemContext();
     LocalDataContainer* container = new LocalDataContainer(
         new BrowsingDataCookieHelper(profile->GetRequestContext()),
         new BrowsingDataDatabaseHelper(profile),
         new BrowsingDataLocalStorageHelper(profile),
         NULL,
         new BrowsingDataAppCacheHelper(profile),
         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,
                              profile->GetExtensionSpecialStoragePolicy(),
                              false));
     cookies_tree_model_->AddCookiesTreeObserver(this);
   }
 }
 
 void CookiesViewHandler::UpdateSearchResults(const base::ListValue* args) {
@@ skipping 51 matching lines @@
   web_ui()->CallJavascriptFunction("CookiesView.loadChildren", args);
 }
 
 void CookiesViewHandler::ReloadCookies(const base::ListValue* args) {
   cookies_tree_model_.reset();
 
   EnsureCookiesTreeModelCreated();
 }
 
 }  // namespace options