Rename ServerBoundCert => ChannelID to reflect the current name

chrome/browser/browsing_data/cookies_tree_model_unittest.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/browsing_data/cookies_tree_model.h"
 
 #include <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_channel_id_helper.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_file_system_helper.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_flash_lso_helper.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_quota_helper.h"
-#include "chrome/browser/browsing_data/mock_browsing_data_server_bound_cert_helper.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/mock_settings_observer.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
@@ skipping 26 matching lines @@
     mock_browsing_data_session_storage_helper_ =
         new MockBrowsingDataLocalStorageHelper(profile_.get());
     mock_browsing_data_appcache_helper_ =
         new MockBrowsingDataAppCacheHelper(profile_.get());
     mock_browsing_data_indexed_db_helper_ =
         new MockBrowsingDataIndexedDBHelper(profile_.get());
     mock_browsing_data_file_system_helper_ =
         new MockBrowsingDataFileSystemHelper(profile_.get());
     mock_browsing_data_quota_helper_ =
         new MockBrowsingDataQuotaHelper(profile_.get());
-    mock_browsing_data_server_bound_cert_helper_ =
-        new MockBrowsingDataServerBoundCertHelper();
+    mock_browsing_data_channel_id_helper_ =
+        new MockBrowsingDataChannelIDHelper();
     mock_browsing_data_flash_lso_helper_ =
         new MockBrowsingDataFlashLSOHelper(profile_.get());
 
     scoped_refptr<CookieSettings> cookie_settings =
         new CookieSettings(profile_->GetHostContentSettingsMap(),
                            profile_->GetPrefs());
     special_storage_policy_ =
         new ExtensionSpecialStoragePolicy(cookie_settings.get());
   }
 
   virtual void TearDown() OVERRIDE {
-    mock_browsing_data_server_bound_cert_helper_ = NULL;
+    mock_browsing_data_channel_id_helper_ = NULL;
     mock_browsing_data_quota_helper_ = NULL;
     mock_browsing_data_file_system_helper_ = NULL;
     mock_browsing_data_indexed_db_helper_ = NULL;
     mock_browsing_data_appcache_helper_ = NULL;
     mock_browsing_data_session_storage_helper_ = NULL;
     mock_browsing_data_local_storage_helper_ = NULL;
     mock_browsing_data_database_helper_ = NULL;
     mock_browsing_data_flash_lso_helper_ = NULL;
     base::MessageLoop::current()->RunUntilIdle();
   }
 
   scoped_ptr<CookiesTreeModel> CreateCookiesTreeModelWithInitialSample() {
     LocalDataContainer* container = new LocalDataContainer(
         mock_browsing_data_cookie_helper_.get(),
         mock_browsing_data_database_helper_.get(),
         mock_browsing_data_local_storage_helper_.get(),
         mock_browsing_data_session_storage_helper_.get(),
         mock_browsing_data_appcache_helper_.get(),
         mock_browsing_data_indexed_db_helper_.get(),
         mock_browsing_data_file_system_helper_.get(),
         mock_browsing_data_quota_helper_.get(),
-        mock_browsing_data_server_bound_cert_helper_.get(),
+        mock_browsing_data_channel_id_helper_.get(),
         mock_browsing_data_flash_lso_helper_.get());
 
     CookiesTreeModel* cookies_model =
         new CookiesTreeModel(container, special_storage_policy_.get(), false);
     mock_browsing_data_cookie_helper_->
         AddCookieSamples(GURL("http://foo1"), "A=1");
     mock_browsing_data_cookie_helper_->
         AddCookieSamples(GURL("http://foo2"), "B=1");
     mock_browsing_data_cookie_helper_->
         AddCookieSamples(GURL("http://foo3"), "C=1");
     mock_browsing_data_cookie_helper_->Notify();
     mock_browsing_data_database_helper_->AddDatabaseSamples();
     mock_browsing_data_database_helper_->Notify();
     mock_browsing_data_local_storage_helper_->AddLocalStorageSamples();
     mock_browsing_data_local_storage_helper_->Notify();
     mock_browsing_data_session_storage_helper_->AddLocalStorageSamples();
     mock_browsing_data_session_storage_helper_->Notify();
     mock_browsing_data_indexed_db_helper_->AddIndexedDBSamples();
     mock_browsing_data_indexed_db_helper_->Notify();
     mock_browsing_data_file_system_helper_->AddFileSystemSamples();
     mock_browsing_data_file_system_helper_->Notify();
     mock_browsing_data_quota_helper_->AddQuotaSamples();
     mock_browsing_data_quota_helper_->Notify();
-    mock_browsing_data_server_bound_cert_helper_->AddServerBoundCertSample(
+    mock_browsing_data_channel_id_helper_->AddChannelIDSample(
         "sbc1");
-    mock_browsing_data_server_bound_cert_helper_->AddServerBoundCertSample(
+    mock_browsing_data_channel_id_helper_->AddChannelIDSample(
         "sbc2");

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

Can we change these strings to "cid1" and "cid2"? This will require additional
changes in this file.

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

Done.

-    mock_browsing_data_server_bound_cert_helper_->Notify();
+    mock_browsing_data_channel_id_helper_->Notify();
     mock_browsing_data_flash_lso_helper_->AddFlashLSODomain("xyz.com");
     mock_browsing_data_flash_lso_helper_->Notify();
 
     {
       SCOPED_TRACE("Initial State 3 cookies, 2 databases, 2 local storages, "
                    "2 session storages, 2 indexed DBs, 3 filesystems, "
                    "2 quotas, 2 server bound certs, 1 Flash LSO");
       // 51 because there's the root, then
       // foo1 -> cookies -> a,
       // foo2 -> cookies -> b,
@@ skipping 21 matching lines @@
                 GetDisplayedLocalStorages(cookies_model));
       EXPECT_EQ("http://host1:1/,http://host2:2/",
                 GetDisplayedSessionStorages(cookies_model));
       EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
                 GetDisplayedIndexedDBs(cookies_model));
       EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
                 GetDisplayedFileSystems(cookies_model));
       EXPECT_EQ("quotahost1,quotahost2",
                 GetDisplayedQuotas(cookies_model));
       EXPECT_EQ("sbc1,sbc2",
-                GetDisplayedServerBoundCerts(cookies_model));
+                GetDisplayedChannelIDs(cookies_model));
       EXPECT_EQ("xyz.com",
                 GetDisplayedFlashLSOs(cookies_model));
     }
     return make_scoped_ptr(cookies_model);
   }
 
   std::string GetNodesOfChildren(
       const CookieTreeNode* node,
       CookieTreeNode::DetailedInfo::NodeType node_type) {
     if (!node->empty()) {
@@ skipping 22 matching lines @@
         return node->GetDetailedInfo().appcache_info->manifest_url.spec() +
                ",";
       case CookieTreeNode::DetailedInfo::TYPE_INDEXED_DB:
         return node->GetDetailedInfo().indexed_db_info->origin_.spec() +
                ",";
       case CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM:
         return node->GetDetailedInfo().file_system_info->origin.spec() +
                ",";
       case CookieTreeNode::DetailedInfo::TYPE_QUOTA:
         return node->GetDetailedInfo().quota_info->host + ",";
-      case CookieTreeNode::DetailedInfo::TYPE_SERVER_BOUND_CERT:
+      case CookieTreeNode::DetailedInfo::TYPE_CHANNEL_ID:
         return node->GetDetailedInfo(
-            ).server_bound_cert->server_identifier() + ",";
+            ).channel_id->server_identifier() + ",";
       case CookieTreeNode::DetailedInfo::TYPE_FLASH_LSO:
         return node->GetDetailedInfo().flash_lso_domain + ",";
       default:
         return std::string();
     }
   }
 
   std::string GetCookiesOfChildren(const CookieTreeNode* node) {
     return GetNodesOfChildren(node, CookieTreeNode::DetailedInfo::TYPE_COOKIE);
   }
@@ skipping 79 matching lines @@
   std::string GetDisplayedFileSystems(CookiesTreeModel* cookies_model) {
     return GetDisplayedNodes(cookies_model,
                              CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM);
   }
 
   std::string GetDisplayedQuotas(CookiesTreeModel* cookies_model) {
     return GetDisplayedNodes(cookies_model,
                              CookieTreeNode::DetailedInfo::TYPE_QUOTA);
   }
 
-  std::string GetDisplayedServerBoundCerts(CookiesTreeModel* cookies_model) {
+  std::string GetDisplayedChannelIDs(CookiesTreeModel* cookies_model) {
     return GetDisplayedNodes(
-        cookies_model, CookieTreeNode::DetailedInfo::TYPE_SERVER_BOUND_CERT);
+        cookies_model, CookieTreeNode::DetailedInfo::TYPE_CHANNEL_ID);
   }
 
   std::string GetDisplayedFlashLSOs(CookiesTreeModel* cookies_model) {
     return GetDisplayedNodes(
         cookies_model, CookieTreeNode::DetailedInfo::TYPE_FLASH_LSO);
   }
 
   // Do not call on the root.
   void DeleteStoredObjects(CookieTreeNode* node) {
     node->DeleteStoredObjects();
@@ skipping 14 matching lines @@
   scoped_refptr<MockBrowsingDataLocalStorageHelper>
       mock_browsing_data_session_storage_helper_;
   scoped_refptr<MockBrowsingDataAppCacheHelper>
       mock_browsing_data_appcache_helper_;
   scoped_refptr<MockBrowsingDataIndexedDBHelper>
       mock_browsing_data_indexed_db_helper_;
   scoped_refptr<MockBrowsingDataFileSystemHelper>
       mock_browsing_data_file_system_helper_;
   scoped_refptr<MockBrowsingDataQuotaHelper>
       mock_browsing_data_quota_helper_;
-  scoped_refptr<MockBrowsingDataServerBoundCertHelper>
-      mock_browsing_data_server_bound_cert_helper_;
+  scoped_refptr<MockBrowsingDataChannelIDHelper>
+      mock_browsing_data_channel_id_helper_;
   scoped_refptr<MockBrowsingDataFlashLSOHelper>
       mock_browsing_data_flash_lso_helper_;
 
   scoped_refptr<ExtensionSpecialStoragePolicy> special_storage_policy_;
 };
 
 TEST_F(CookiesTreeModelTest, RemoveAll) {
   scoped_ptr<CookiesTreeModel> cookies_model(
       CreateCookiesTreeModelWithInitialSample());
 
   // Reset the selection of the first row.
   {
     SCOPED_TRACE("Before removing");
     EXPECT_EQ("A,B,C",
               GetDisplayedCookies(cookies_model.get()));
     EXPECT_EQ("db1,db2",
               GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2",
               GetDisplayedQuotas(cookies_model.get()));
     EXPECT_EQ("sbc1,sbc2",
-              GetDisplayedServerBoundCerts(cookies_model.get()));
+              GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ("xyz.com",
               GetDisplayedFlashLSOs(cookies_model.get()));
   }
 
   mock_browsing_data_cookie_helper_->Reset();
   mock_browsing_data_database_helper_->Reset();
   mock_browsing_data_local_storage_helper_->Reset();
   mock_browsing_data_session_storage_helper_->Reset();
   mock_browsing_data_indexed_db_helper_->Reset();
   mock_browsing_data_file_system_helper_->Reset();
 
   cookies_model->DeleteAllStoredObjects();
 
   // Make sure the nodes are also deleted from the model's cache.
   // http://crbug.com/43249
   cookies_model->UpdateSearchResults(base::string16());
 
   {
     // 2 nodes - root and app
     SCOPED_TRACE("After removing");
     EXPECT_EQ(1, cookies_model->GetRoot()->GetTotalNodeCount());
     EXPECT_EQ(0, cookies_model->GetRoot()->child_count());
     EXPECT_EQ(std::string(), GetDisplayedCookies(cookies_model.get()));
     EXPECT_TRUE(mock_browsing_data_cookie_helper_->AllDeleted());
     EXPECT_TRUE(mock_browsing_data_database_helper_->AllDeleted());
     EXPECT_TRUE(mock_browsing_data_local_storage_helper_->AllDeleted());
     EXPECT_FALSE(mock_browsing_data_session_storage_helper_->AllDeleted());
     EXPECT_TRUE(mock_browsing_data_indexed_db_helper_->AllDeleted());
     EXPECT_TRUE(mock_browsing_data_file_system_helper_->AllDeleted());
-    EXPECT_TRUE(mock_browsing_data_server_bound_cert_helper_->AllDeleted());
+    EXPECT_TRUE(mock_browsing_data_channel_id_helper_->AllDeleted());
     EXPECT_TRUE(mock_browsing_data_flash_lso_helper_->AllDeleted());
   }
 }
 
 TEST_F(CookiesTreeModelTest, Remove) {
   scoped_ptr<CookiesTreeModel> cookies_model(
       CreateCookiesTreeModelWithInitialSample());
 
   // Children start out arranged as follows:
   //
@@ skipping 27 matching lines @@
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2",
               GetDisplayedQuotas(cookies_model.get()));
     EXPECT_EQ("sbc1,sbc2",
-              GetDisplayedServerBoundCerts(cookies_model.get()));
+              GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ(51, cookies_model->GetRoot()->GetTotalNodeCount());
   }
   DeleteStoredObjects(cookies_model->GetRoot()->GetChild(15));
   {
     SCOPED_TRACE("`sbc2` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2",
               GetDisplayedQuotas(cookies_model.get()));
     EXPECT_EQ("sbc1",
-              GetDisplayedServerBoundCerts(cookies_model.get()));
+              GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ(48, cookies_model->GetRoot()->GetTotalNodeCount());
   }
   DeleteStoredObjects(cookies_model->GetRoot()->GetChild(14));
   {
     SCOPED_TRACE("`sbc1` removed.");
     EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
@@ skipping 202 matching lines @@
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
-    EXPECT_EQ("sbc1,sbc2", GetDisplayedServerBoundCerts(cookies_model.get()));
+    EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
   }
 
   DeleteStoredObjects(
       cookies_model->GetRoot()->GetChild(6)->GetChild(0));
   {
     SCOPED_TRACE("First database removed");
     EXPECT_STREQ("B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
-    EXPECT_EQ("sbc1,sbc2", GetDisplayedServerBoundCerts(cookies_model.get()));
+    EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ(49, cookies_model->GetRoot()->GetTotalNodeCount());
   }
 
   DeleteStoredObjects(
       cookies_model->GetRoot()->GetChild(8)->GetChild(0));
   {
     SCOPED_TRACE("First origin removed");
     EXPECT_STREQ("B,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
-    EXPECT_EQ("sbc1,sbc2", GetDisplayedServerBoundCerts(cookies_model.get()));
+    EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ(47, cookies_model->GetRoot()->GetTotalNodeCount());
   }
 }
 
 TEST_F(CookiesTreeModelTest, RemoveCookieNode) {
   scoped_ptr<CookiesTreeModel> cookies_model(
       CreateCookiesTreeModelWithInitialSample());
 
   DeleteStoredObjects(
       cookies_model->GetRoot()->GetChild(1)->GetChild(0));
   {
     SCOPED_TRACE("Second origin COOKIES node removed");
     EXPECT_STREQ("A,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
-    EXPECT_EQ("sbc1,sbc2", GetDisplayedServerBoundCerts(cookies_model.get()));
+    EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
     // 51 because in this case, the origin remains, although the COOKIES
     // node beneath it has been deleted.
     EXPECT_EQ(51, cookies_model->GetRoot()->GetTotalNodeCount());
   }
 
   DeleteStoredObjects(
       cookies_model->GetRoot()->GetChild(6)->GetChild(0));
   {
     SCOPED_TRACE("First database removed");
     EXPECT_STREQ("A,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
-    EXPECT_EQ("sbc1,sbc2", GetDisplayedServerBoundCerts(cookies_model.get()));
+    EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ(49, cookies_model->GetRoot()->GetTotalNodeCount());
   }
 
   DeleteStoredObjects(
       cookies_model->GetRoot()->GetChild(8)->GetChild(0));
   {
     SCOPED_TRACE("First origin removed");
     EXPECT_STREQ("A,C", GetDisplayedCookies(cookies_model.get()).c_str());
     EXPECT_EQ("db2", GetDisplayedDatabases(cookies_model.get()));
     EXPECT_EQ("http://host2:2/",
               GetDisplayedLocalStorages(cookies_model.get()));
     EXPECT_EQ("http://host1:1/,http://host2:2/",
               GetDisplayedSessionStorages(cookies_model.get()));
     EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
               GetDisplayedIndexedDBs(cookies_model.get()));
     EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
               GetDisplayedFileSystems(cookies_model.get()));
     EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
-    EXPECT_EQ("sbc1,sbc2", GetDisplayedServerBoundCerts(cookies_model.get()));
+    EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
     EXPECT_EQ(47, cookies_model->GetRoot()->GetTotalNodeCount());
   }
 }
 
 TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) {
   LocalDataContainer* container =
       new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
                              mock_browsing_data_database_helper_.get(),
                              mock_browsing_data_local_storage_helper_.get(),
                              mock_browsing_data_session_storage_helper_.get(),
                              mock_browsing_data_appcache_helper_.get(),
                              mock_browsing_data_indexed_db_helper_.get(),
                              mock_browsing_data_file_system_helper_.get(),
                              mock_browsing_data_quota_helper_.get(),
-                             mock_browsing_data_server_bound_cert_helper_.get(),
+                             mock_browsing_data_channel_id_helper_.get(),
                              mock_browsing_data_flash_lso_helper_.get());
   CookiesTreeModel cookies_model(
       container, special_storage_policy_.get(), false);
 
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo1"), "A=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo2"), "B=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo3"), "C=1");
@@ skipping 68 matching lines @@
 TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) {
   LocalDataContainer* container =
       new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
                              mock_browsing_data_database_helper_.get(),
                              mock_browsing_data_local_storage_helper_.get(),
                              mock_browsing_data_session_storage_helper_.get(),
                              mock_browsing_data_appcache_helper_.get(),
                              mock_browsing_data_indexed_db_helper_.get(),
                              mock_browsing_data_file_system_helper_.get(),
                              mock_browsing_data_quota_helper_.get(),
-                             mock_browsing_data_server_bound_cert_helper_.get(),
+                             mock_browsing_data_channel_id_helper_.get(),
                              mock_browsing_data_flash_lso_helper_.get());
   CookiesTreeModel cookies_model(
       container, special_storage_policy_.get(), false);
 
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo1"), "A=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo2"), "B=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo3"), "C=1");
@@ skipping 71 matching lines @@
 TEST_F(CookiesTreeModelTest, RemoveSecondOrigin) {
   LocalDataContainer* container =
       new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
                              mock_browsing_data_database_helper_.get(),
                              mock_browsing_data_local_storage_helper_.get(),
                              mock_browsing_data_session_storage_helper_.get(),
                              mock_browsing_data_appcache_helper_.get(),
                              mock_browsing_data_indexed_db_helper_.get(),
                              mock_browsing_data_file_system_helper_.get(),
                              mock_browsing_data_quota_helper_.get(),
-                             mock_browsing_data_server_bound_cert_helper_.get(),
+                             mock_browsing_data_channel_id_helper_.get(),
                              mock_browsing_data_flash_lso_helper_.get());
   CookiesTreeModel cookies_model(
       container, special_storage_policy_.get(), false);
 
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo1"), "A=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo2"), "B=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo3"), "C=1");
@@ skipping 22 matching lines @@
 TEST_F(CookiesTreeModelTest, OriginOrdering) {
   LocalDataContainer* container =
       new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
                              mock_browsing_data_database_helper_.get(),
                              mock_browsing_data_local_storage_helper_.get(),
                              mock_browsing_data_session_storage_helper_.get(),
                              mock_browsing_data_appcache_helper_.get(),
                              mock_browsing_data_indexed_db_helper_.get(),
                              mock_browsing_data_file_system_helper_.get(),
                              mock_browsing_data_quota_helper_.get(),
-                             mock_browsing_data_server_bound_cert_helper_.get(),
+                             mock_browsing_data_channel_id_helper_.get(),
                              mock_browsing_data_flash_lso_helper_.get());
   CookiesTreeModel cookies_model(
       container, special_storage_policy_.get(), false);
 
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://a.foo2.com"), "A=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo2.com"), "B=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://b.foo1.com"), "C=1");
@@ skipping 27 matching lines @@
   GURL host("http://xyz.com/");
   LocalDataContainer* container =
       new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
                              mock_browsing_data_database_helper_.get(),
                              mock_browsing_data_local_storage_helper_.get(),
                              mock_browsing_data_session_storage_helper_.get(),
                              mock_browsing_data_appcache_helper_.get(),
                              mock_browsing_data_indexed_db_helper_.get(),
                              mock_browsing_data_file_system_helper_.get(),
                              mock_browsing_data_quota_helper_.get(),
-                             mock_browsing_data_server_bound_cert_helper_.get(),
+                             mock_browsing_data_channel_id_helper_.get(),
                              mock_browsing_data_flash_lso_helper_.get());
   CookiesTreeModel cookies_model(
       container, special_storage_policy_.get(), false);
 
   mock_browsing_data_cookie_helper_->AddCookieSamples(host, "A=1");
   mock_browsing_data_cookie_helper_->Notify();
 
   TestingProfile profile;
   HostContentSettingsMap* content_settings =
       profile.GetHostContentSettingsMap();
@@ skipping 53 matching lines @@
 TEST_F(CookiesTreeModelTest, CookiesFilter) {
   LocalDataContainer* container =
       new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
                              mock_browsing_data_database_helper_.get(),
                              mock_browsing_data_local_storage_helper_.get(),
                              mock_browsing_data_session_storage_helper_.get(),
                              mock_browsing_data_appcache_helper_.get(),
                              mock_browsing_data_indexed_db_helper_.get(),
                              mock_browsing_data_file_system_helper_.get(),
                              mock_browsing_data_quota_helper_.get(),
-                             mock_browsing_data_server_bound_cert_helper_.get(),
+                             mock_browsing_data_channel_id_helper_.get(),
                              mock_browsing_data_flash_lso_helper_.get());
   CookiesTreeModel cookies_model(
       container, special_storage_policy_.get(), false);
 
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://123.com"), "A=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo1.com"), "B=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo2.com"), "C=1");
   mock_browsing_data_cookie_helper_->
       AddCookieSamples(GURL("http://foo3.com"), "D=1");
   mock_browsing_data_cookie_helper_->Notify();
   EXPECT_EQ("A,B,C,D", GetDisplayedCookies(&cookies_model));
 
   cookies_model.UpdateSearchResults(base::string16(base::ASCIIToUTF16("foo")));
   EXPECT_EQ("B,C,D", GetDisplayedCookies(&cookies_model));
 
   cookies_model.UpdateSearchResults(base::string16(base::ASCIIToUTF16("2")));
   EXPECT_EQ("A,C", GetDisplayedCookies(&cookies_model));
 
   cookies_model.UpdateSearchResults(base::string16(base::ASCIIToUTF16("foo3")));
   EXPECT_EQ("D", GetDisplayedCookies(&cookies_model));
 
   cookies_model.UpdateSearchResults(base::string16());
   EXPECT_EQ("A,B,C,D", GetDisplayedCookies(&cookies_model));
 }
 
 }  // namespace