Rename ServerBoundCert => ChannelID to reflect the current name

chrome/browser/browsing_data/local_data_container.cc

Index: chrome/browser/browsing_data/local_data_container.cc
diff --git a/chrome/browser/browsing_data/local_data_container.cc b/chrome/browser/browsing_data/local_data_container.cc
index b7648de6bf0d73aced9f782bf7331b45fa0c148f..d582f63c4d7a6e443678ec68e15008fdc9a89838 100644
--- a/chrome/browser/browsing_data/local_data_container.cc
+++ b/chrome/browser/browsing_data/local_data_container.cc
@@ -6,8 +6,8 @@
 
 #include "base/bind.h"
 #include "base/memory/linked_ptr.h"
+#include "chrome/browser/browsing_data/browsing_data_channel_id_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/browsing_data/cookies_tree_model.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "net/cookies/canonical_cookie.h"
@@ -24,7 +24,7 @@ LocalDataContainer::LocalDataContainer(
     BrowsingDataIndexedDBHelper* indexed_db_helper,
     BrowsingDataFileSystemHelper* file_system_helper,
     BrowsingDataQuotaHelper* quota_helper,
-    BrowsingDataServerBoundCertHelper* server_bound_cert_helper,
+    BrowsingDataChannelIDHelper* channel_id_helper,
     BrowsingDataFlashLSOHelper* flash_lso_helper)
     : appcache_helper_(appcache_helper),
       cookie_helper_(cookie_helper),
@@ -34,7 +34,7 @@ LocalDataContainer::LocalDataContainer(
       indexed_db_helper_(indexed_db_helper),
       file_system_helper_(file_system_helper),
       quota_helper_(quota_helper),
-      server_bound_cert_helper_(server_bound_cert_helper),
+      channel_id_helper_(channel_id_helper),
       flash_lso_helper_(flash_lso_helper),
       model_(NULL),
       weak_ptr_factory_(this) {}
@@ -94,9 +94,9 @@ void LocalDataContainer::Init(CookiesTreeModel* model) {
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
-  if (server_bound_cert_helper_.get()) {
-    server_bound_cert_helper_->StartFetching(
-        base::Bind(&LocalDataContainer::OnServerBoundCertModelInfoLoaded,
+  if (channel_id_helper_.get()) {
+    channel_id_helper_->StartFetching(
+        base::Bind(&LocalDataContainer::OnChannelIDModelInfoLoaded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
@@ -180,11 +180,11 @@ void LocalDataContainer::OnQuotaModelInfoLoaded(
   model_->PopulateQuotaInfo(this);
 }
 
-void LocalDataContainer::OnServerBoundCertModelInfoLoaded(
-    const ServerBoundCertList& cert_list) {
-  server_bound_cert_list_ = cert_list;
+void LocalDataContainer::OnChannelIDModelInfoLoaded(
+    const ChannelIDList& cert_list) {

[wtc, 2014/07/01 19:50:49]

cert_list => channel_id_list

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

Done.

+  channel_id_list_ = cert_list;
   DCHECK(model_);
-  model_->PopulateServerBoundCertInfo(this);
+  model_->PopulateChannelIDInfo(this);
 }
 
 void LocalDataContainer::OnFlashLSOInfoLoaded(