Rename ServerBoundCert => ChannelID to reflect the current name

chrome/browser/browsing_data/cookies_tree_model.cc

Index: chrome/browser/browsing_data/cookies_tree_model.cc
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc
index f1c15e277e168b886cfe0e6e9ed1ed92dbe37de7..e326fd3c3ad2eb8dabdf17a32d77dd255331e02e 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model.cc
@@ -12,9 +12,9 @@
 #include "base/memory/linked_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.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_flash_lso_helper.h"
-#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
@@ -129,7 +129,7 @@ bool TypeIsProtected(CookieTreeNode::DetailedInfo::NodeType type) {
       return true;
     case CookieTreeNode::DetailedInfo::TYPE_QUOTA:
       return false;
-    case CookieTreeNode::DetailedInfo::TYPE_SERVER_BOUND_CERT:
+    case CookieTreeNode::DetailedInfo::TYPE_CHANNEL_ID:
       return false;
     case CookieTreeNode::DetailedInfo::TYPE_FLASH_LSO:
       return false;
@@ -163,7 +163,7 @@ CookieTreeNode::DetailedInfo::DetailedInfo()
       indexed_db_info(NULL),
       file_system_info(NULL),
       quota_info(NULL),
-      server_bound_cert(NULL) {}
+      channel_id(NULL) {}
 
 CookieTreeNode::DetailedInfo::~DetailedInfo() {}
 
@@ -244,10 +244,10 @@ CookieTreeNode::DetailedInfo& CookieTreeNode::DetailedInfo::InitQuota(
   return *this;
 }
 
-CookieTreeNode::DetailedInfo& CookieTreeNode::DetailedInfo::InitServerBoundCert(
-    const net::ServerBoundCertStore::ServerBoundCert* server_bound_cert) {
-  Init(TYPE_SERVER_BOUND_CERT);
-  this->server_bound_cert = server_bound_cert;
+CookieTreeNode::DetailedInfo& CookieTreeNode::DetailedInfo::InitChannelID(
+    const net::ChannelIDStore::ChannelID* channel_id) {
+  Init(TYPE_CHANNEL_ID);
+  this->channel_id = channel_id;
   return *this;
 }
 
@@ -491,29 +491,29 @@ CookieTreeNode::DetailedInfo CookieTreeQuotaNode::GetDetailedInfo() const {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// CookieTreeServerBoundCertNode, public:
+// CookieTreeChannelIDNode, public:
 
-CookieTreeServerBoundCertNode::CookieTreeServerBoundCertNode(
-      net::ServerBoundCertStore::ServerBoundCertList::iterator cert)
-    : CookieTreeNode(base::ASCIIToUTF16(cert->server_identifier())),
-      server_bound_cert_(cert) {
+CookieTreeChannelIDNode::CookieTreeChannelIDNode(
+      net::ChannelIDStore::ChannelIDList::iterator channel_id)
+    : CookieTreeNode(base::ASCIIToUTF16(channel_id->server_identifier())),
+      channel_id_(channel_id) {
 }
 
-CookieTreeServerBoundCertNode::~CookieTreeServerBoundCertNode() {}
+CookieTreeChannelIDNode::~CookieTreeChannelIDNode() {}
 
-void CookieTreeServerBoundCertNode::DeleteStoredObjects() {
+void CookieTreeChannelIDNode::DeleteStoredObjects() {
   LocalDataContainer* container = GetLocalDataContainerForNode(this);
 
   if (container) {
-    container->server_bound_cert_helper_->DeleteServerBoundCert(
-        server_bound_cert_->server_identifier());
-    container->server_bound_cert_list_.erase(server_bound_cert_);
+    container->channel_id_helper_->DeleteChannelID(
+        channel_id_->server_identifier());
+    container->channel_id_list_.erase(channel_id_);
   }
 }
 
 CookieTreeNode::DetailedInfo
-CookieTreeServerBoundCertNode::GetDetailedInfo() const {
-  return DetailedInfo().InitServerBoundCert(&*server_bound_cert_);
+CookieTreeChannelIDNode::GetDetailedInfo() const {
+  return DetailedInfo().InitChannelID(&*channel_id_);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -574,7 +574,7 @@ CookieTreeHostNode::CookieTreeHostNode(const GURL& url)
       indexed_dbs_child_(NULL),
       file_systems_child_(NULL),
       quota_child_(NULL),
-      server_bound_certs_child_(NULL),
+      channel_ids_child_(NULL),
       flash_lso_child_(NULL),
       url_(url),
       canonicalized_host_(CanonicalizeHost(url)) {}
@@ -658,13 +658,13 @@ CookieTreeQuotaNode* CookieTreeHostNode::UpdateOrCreateQuotaNode(
   return quota_child_;
 }
 
-CookieTreeServerBoundCertsNode*
-CookieTreeHostNode::GetOrCreateServerBoundCertsNode() {
-  if (server_bound_certs_child_)
-    return server_bound_certs_child_;
-  server_bound_certs_child_ = new CookieTreeServerBoundCertsNode;
-  AddChildSortedByTitle(server_bound_certs_child_);
-  return server_bound_certs_child_;
+CookieTreeChannelIDsNode*
+CookieTreeHostNode::GetOrCreateChannelIDsNode() {
+  if (channel_ids_child_)
+    return channel_ids_child_;
+  channel_ids_child_ = new CookieTreeChannelIDsNode;
+  AddChildSortedByTitle(channel_ids_child_);
+  return channel_ids_child_;
 }
 
 CookieTreeFlashLSONode* CookieTreeHostNode::GetOrCreateFlashLSONode(
@@ -794,18 +794,18 @@ CookieTreeFileSystemsNode::GetDetailedInfo() const {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// CookieTreeServerBoundCertsNode, public:
+// CookieTreeChannelIDsNode, public:
 
-CookieTreeServerBoundCertsNode::CookieTreeServerBoundCertsNode()
+CookieTreeChannelIDsNode::CookieTreeChannelIDsNode()
     : CookieTreeNode(
-        l10n_util::GetStringUTF16(IDS_COOKIES_SERVER_BOUND_CERTS)) {
+        l10n_util::GetStringUTF16(IDS_COOKIES_CHANNEL_IDS)) {
 }
 
-CookieTreeServerBoundCertsNode::~CookieTreeServerBoundCertsNode() {}
+CookieTreeChannelIDsNode::~CookieTreeChannelIDsNode() {}
 
 CookieTreeNode::DetailedInfo
-CookieTreeServerBoundCertsNode::GetDetailedInfo() const {
-  return DetailedInfo().Init(DetailedInfo::TYPE_SERVER_BOUND_CERTS);
+CookieTreeChannelIDsNode::GetDetailedInfo() const {
+  return DetailedInfo().Init(DetailedInfo::TYPE_CHANNEL_IDS);
 }
 
 void CookieTreeNode::AddChildSortedByTitle(CookieTreeNode* new_child) {
@@ -915,7 +915,7 @@ int CookiesTreeModel::GetIconIndex(ui::TreeModelNode* node) {
       return DATABASE;  // ditto
     case CookieTreeNode::DetailedInfo::TYPE_QUOTA:
       return -1;
-    case CookieTreeNode::DetailedInfo::TYPE_SERVER_BOUND_CERT:
+    case CookieTreeNode::DetailedInfo::TYPE_CHANNEL_ID:
       return COOKIE;  // It's kinda like a cookie?
     default:
       break;
@@ -960,7 +960,7 @@ void CookiesTreeModel::UpdateSearchResults(const base::string16& filter) {
   PopulateIndexedDBInfoWithFilter(data_container(), &notifier, filter);
   PopulateFileSystemInfoWithFilter(data_container(), &notifier, filter);
   PopulateQuotaInfoWithFilter(data_container(), &notifier, filter);
-  PopulateServerBoundCertInfoWithFilter(data_container(), &notifier, filter);
+  PopulateChannelIDInfoWithFilter(data_container(), &notifier, filter);
 }
 
 const extensions::ExtensionSet* CookiesTreeModel::ExtensionsProtectingNode(
@@ -1030,10 +1030,10 @@ void CookiesTreeModel::PopulateQuotaInfo(LocalDataContainer* container) {
   PopulateQuotaInfoWithFilter(container, &notifier, base::string16());
 }
 
-void CookiesTreeModel::PopulateServerBoundCertInfo(
+void CookiesTreeModel::PopulateChannelIDInfo(
       LocalDataContainer* container) {
   ScopedBatchUpdateNotifier notifier(this, GetRoot());
-  PopulateServerBoundCertInfoWithFilter(container, &notifier, base::string16());
+  PopulateChannelIDInfoWithFilter(container, &notifier, base::string16());
 }
 
 void CookiesTreeModel::PopulateFlashLSOInfo(
@@ -1217,35 +1217,35 @@ void CookiesTreeModel::PopulateIndexedDBInfoWithFilter(
   }
 }
 
-void CookiesTreeModel::PopulateServerBoundCertInfoWithFilter(
+void CookiesTreeModel::PopulateChannelIDInfoWithFilter(
     LocalDataContainer* container,
     ScopedBatchUpdateNotifier* notifier,
     const base::string16& filter) {
   CookieTreeRootNode* root = static_cast<CookieTreeRootNode*>(GetRoot());
 
-  if (container->server_bound_cert_list_.empty())
+  if (container->channel_id_list_.empty())
     return;
 
   notifier->StartBatchUpdate();
-  for (ServerBoundCertList::iterator cert_info =
-           container->server_bound_cert_list_.begin();
-       cert_info != container->server_bound_cert_list_.end();
-       ++cert_info) {
-    GURL origin(cert_info->server_identifier());
+  for (ChannelIDList::iterator channel_id_info =
+           container->channel_id_list_.begin();
+       channel_id_info != container->channel_id_list_.end();
+       ++channel_id_info) {
+    GURL origin(channel_id_info->server_identifier());
     if (!origin.is_valid()) {
-      // Domain Bound Cert.  Make a valid URL to satisfy the
+      // Channel ID.  Make a valid URL to satisfy the
       // CookieTreeRootNode::GetOrCreateHostNode interface.
       origin = GURL(std::string(url::kHttpsScheme) +
           url::kStandardSchemeSeparator +
-          cert_info->server_identifier() + "/");
+          channel_id_info->server_identifier() + "/");
     }
     base::string16 title = CookieTreeHostNode::TitleForUrl(origin);
     if (!filter.size() || title.find(filter) != base::string16::npos) {
       CookieTreeHostNode* host_node = root->GetOrCreateHostNode(origin);
-      CookieTreeServerBoundCertsNode* server_bound_certs_node =
-          host_node->GetOrCreateServerBoundCertsNode();
-      server_bound_certs_node->AddServerBoundCertNode(
-          new CookieTreeServerBoundCertNode(cert_info));
+      CookieTreeChannelIDsNode* channel_ids_node =
+          host_node->GetOrCreateChannelIDsNode();
+      channel_ids_node->AddChannelIDNode(
+          new CookieTreeChannelIDNode(channel_id_info));
     }
   }
 }