Rename ServerBoundCert => ChannelID to reflect the current name

chrome/browser/browsing_data/cookies_tree_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_BROWSING_DATA_COOKIES_TREE_MODEL_H_
 #define CHROME_BROWSER_BROWSING_DATA_COOKIES_TREE_MODEL_H_
 
 // TODO(viettrungluu): This header file #includes far too much and has too much
 // inline code (which shouldn't be inline).
 
 #include <list>
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/browsing_data_appcache_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_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/local_data_container.h"
 #include "chrome/common/content_settings.h"
-#include "net/ssl/server_bound_cert_store.h"
+#include "net/ssl/channel_id_store.h"
 #include "ui/base/models/tree_node_model.h"
 
 class BrowsingDataCookieHelper;
-class BrowsingDataServerBoundCertHelper;
+class BrowsingDataChannelIDHelper;

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

List in alphabetical order.

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

Done.

 class CookieSettings;
 class CookiesTreeModel;
 class CookieTreeAppCacheNode;
 class CookieTreeAppCachesNode;
 class CookieTreeCookieNode;
 class CookieTreeCookiesNode;
 class CookieTreeDatabaseNode;
 class CookieTreeDatabasesNode;
 class CookieTreeFileSystemNode;
 class CookieTreeFileSystemsNode;
 class CookieTreeFlashLSONode;
 class CookieTreeHostNode;
 class CookieTreeIndexedDBNode;
 class CookieTreeIndexedDBsNode;
 class CookieTreeLocalStorageNode;
 class CookieTreeLocalStoragesNode;
 class CookieTreeQuotaNode;
-class CookieTreeServerBoundCertNode;
-class CookieTreeServerBoundCertsNode;
+class CookieTreeChannelIDNode;
+class CookieTreeChannelIDsNode;

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

List in alphabetical order.

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

Done.

 class CookieTreeSessionStorageNode;
 class CookieTreeSessionStoragesNode;
 class ExtensionSpecialStoragePolicy;
 
 namespace extensions {
 class ExtensionSet;
 }
 
 namespace net {
 class CanonicalCookie;
@@ skipping 22 matching lines @@
       TYPE_LOCAL_STORAGE,  // This is used for CookieTreeLocalStorageNode.
       TYPE_SESSION_STORAGES,  // This is used for CookieTreeSessionStoragesNode.
       TYPE_SESSION_STORAGE,  // This is used for CookieTreeSessionStorageNode.
       TYPE_APPCACHES,  // This is used for CookieTreeAppCachesNode.
       TYPE_APPCACHE,  // This is used for CookieTreeAppCacheNode.
       TYPE_INDEXED_DBS,  // This is used for CookieTreeIndexedDBsNode.
       TYPE_INDEXED_DB,  // This is used for CookieTreeIndexedDBNode.
       TYPE_FILE_SYSTEMS,  // This is used for CookieTreeFileSystemsNode.
       TYPE_FILE_SYSTEM,  // This is used for CookieTreeFileSystemNode.
       TYPE_QUOTA,  // This is used for CookieTreeQuotaNode.
-      TYPE_SERVER_BOUND_CERTS, // Used for CookieTreeServerBoundCertsNode.
-      TYPE_SERVER_BOUND_CERT, // Used for CookieTreeServerBoundCertNode.
+      TYPE_CHANNEL_IDS, // Used for CookieTreeChannelIDsNode.
+      TYPE_CHANNEL_ID, // Used for CookieTreeChannelIDNode.
       TYPE_FLASH_LSO,  // This is used for CookieTreeFlashLSONode.
     };
 
     DetailedInfo();
     ~DetailedInfo();
 
     DetailedInfo& Init(NodeType type);
     DetailedInfo& InitHost();
     DetailedInfo& InitCookie(const net::CanonicalCookie* cookie);
     DetailedInfo& InitDatabase(
         const BrowsingDataDatabaseHelper::DatabaseInfo* database_info);
     DetailedInfo& InitLocalStorage(
         const BrowsingDataLocalStorageHelper::LocalStorageInfo*
         local_storage_info);
     DetailedInfo& InitSessionStorage(
         const BrowsingDataLocalStorageHelper::LocalStorageInfo*
         session_storage_info);
     DetailedInfo& InitAppCache(const GURL& origin,
                                const content::AppCacheInfo* appcache_info);
     DetailedInfo& InitIndexedDB(
         const content::IndexedDBInfo* indexed_db_info);
     DetailedInfo& InitFileSystem(
         const BrowsingDataFileSystemHelper::FileSystemInfo* file_system_info);
     DetailedInfo& InitQuota(
         const BrowsingDataQuotaHelper::QuotaInfo* quota_info);
-    DetailedInfo& InitServerBoundCert(
-        const net::ServerBoundCertStore::ServerBoundCert* server_bound_cert);
+    DetailedInfo& InitChannelID(
+        const net::ChannelIDStore::ChannelID* channel_id);
     DetailedInfo& InitFlashLSO(const std::string& flash_lso_domain);
 
     NodeType node_type;
     GURL origin;
     const net::CanonicalCookie* cookie;
     const BrowsingDataDatabaseHelper::DatabaseInfo* database_info;
     const BrowsingDataLocalStorageHelper::LocalStorageInfo* local_storage_info;
     const BrowsingDataLocalStorageHelper::LocalStorageInfo*
         session_storage_info;
     const content::AppCacheInfo* appcache_info;
     const content::IndexedDBInfo* indexed_db_info;
     const BrowsingDataFileSystemHelper::FileSystemInfo* file_system_info;
     const BrowsingDataQuotaHelper::QuotaInfo* quota_info;
-    const net::ServerBoundCertStore::ServerBoundCert* server_bound_cert;
+    const net::ChannelIDStore::ChannelID* channel_id;
     std::string flash_lso_domain;
   };
 
   CookieTreeNode() {}
   explicit CookieTreeNode(const base::string16& title)
       : ui::TreeNode<CookieTreeNode>(title) {}
   virtual ~CookieTreeNode() {}
 
   // Delete backend storage for this node, and any children nodes. (E.g. delete
   // the cookie from CookieMonster, clear the database, and so forth.)
@@ skipping 45 matching lines @@
   virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
   // CookieTreeHostNode methods:
   CookieTreeCookiesNode* GetOrCreateCookiesNode();
   CookieTreeDatabasesNode* GetOrCreateDatabasesNode();
   CookieTreeLocalStoragesNode* GetOrCreateLocalStoragesNode();
   CookieTreeSessionStoragesNode* GetOrCreateSessionStoragesNode();
   CookieTreeAppCachesNode* GetOrCreateAppCachesNode();
   CookieTreeIndexedDBsNode* GetOrCreateIndexedDBsNode();
   CookieTreeFileSystemsNode* GetOrCreateFileSystemsNode();
-  CookieTreeServerBoundCertsNode* GetOrCreateServerBoundCertsNode();
+  CookieTreeChannelIDsNode* GetOrCreateChannelIDsNode();
   CookieTreeQuotaNode* UpdateOrCreateQuotaNode(
       std::list<BrowsingDataQuotaHelper::QuotaInfo>::iterator quota_info);
   CookieTreeFlashLSONode* GetOrCreateFlashLSONode(const std::string& domain);
 
   std::string canonicalized_host() const { return canonicalized_host_; }
 
   // Creates an content exception for this origin of type
   // CONTENT_SETTINGS_TYPE_COOKIES.
   void CreateContentException(CookieSettings* cookie_settings,
                               ContentSetting setting) const;
@@ skipping 10 matching lines @@
   // them to see if they are a COOKIES, APPCACHES, DATABASES etc node seems
   // less preferable than storing an extra pointer per origin.
   CookieTreeCookiesNode* cookies_child_;
   CookieTreeDatabasesNode* databases_child_;
   CookieTreeLocalStoragesNode* local_storages_child_;
   CookieTreeSessionStoragesNode* session_storages_child_;
   CookieTreeAppCachesNode* appcaches_child_;
   CookieTreeIndexedDBsNode* indexed_dbs_child_;
   CookieTreeFileSystemsNode* file_systems_child_;
   CookieTreeQuotaNode* quota_child_;
-  CookieTreeServerBoundCertsNode* server_bound_certs_child_;
+  CookieTreeChannelIDsNode* channel_ids_child_;
   CookieTreeFlashLSONode* flash_lso_child_;
 
   // The URL for which this node was initially created.
   GURL url_;
 
   std::string canonicalized_host_;
 
   DISALLOW_COPY_AND_ASSIGN(CookieTreeHostNode);
 };
 
@@ skipping 279 matching lines @@
   virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
  private:
   // quota_info_ is expected to remain valid as long as the CookieTreeQuotaNode
   // is valid.
   std::list<BrowsingDataQuotaHelper::QuotaInfo>::iterator quota_info_;
 
   DISALLOW_COPY_AND_ASSIGN(CookieTreeQuotaNode);
 };
 
-// CookieTreeServerBoundCertNode ---------------------------------------------
-class CookieTreeServerBoundCertNode : public CookieTreeNode {
+// CookieTreeChannelIDNode ---------------------------------------------
+class CookieTreeChannelIDNode : public CookieTreeNode {
  public:
-  friend class CookieTreeServerBoundCertsNode;
+  friend class CookieTreeChannelIDsNode;
 
   // The iterator should remain valid at least as long as the
-  // CookieTreeServerBoundCertNode is valid.
-  explicit CookieTreeServerBoundCertNode(
-      net::ServerBoundCertStore::ServerBoundCertList::iterator cert);
-  virtual ~CookieTreeServerBoundCertNode();
+  // CookieTreeChannelIDNode is valid.
+  explicit CookieTreeChannelIDNode(
+      net::ChannelIDStore::ChannelIDList::iterator cert);
+  virtual ~CookieTreeChannelIDNode();
 
   // CookieTreeNode methods:
   virtual void DeleteStoredObjects() OVERRIDE;
   virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
  private:
-  // server_bound_cert_ is expected to remain valid as long as the
-  // CookieTreeServerBoundCertNode is valid.
-  net::ServerBoundCertStore::ServerBoundCertList::iterator server_bound_cert_;
+  // channel_id_ is expected to remain valid as long as the
+  // CookieTreeChannelIDNode is valid.
+  net::ChannelIDStore::ChannelIDList::iterator channel_id_;
 
-  DISALLOW_COPY_AND_ASSIGN(CookieTreeServerBoundCertNode);
+  DISALLOW_COPY_AND_ASSIGN(CookieTreeChannelIDNode);
 };
 
-class CookieTreeServerBoundCertsNode : public CookieTreeNode {
+class CookieTreeChannelIDsNode : public CookieTreeNode {
  public:
-  CookieTreeServerBoundCertsNode();
-  virtual ~CookieTreeServerBoundCertsNode();
+  CookieTreeChannelIDsNode();
+  virtual ~CookieTreeChannelIDsNode();
 
   virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
-  void AddServerBoundCertNode(CookieTreeServerBoundCertNode* child) {
+  void AddChannelIDNode(CookieTreeChannelIDNode* child) {
     AddChildSortedByTitle(child);
   }
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(CookieTreeServerBoundCertsNode);
+  DISALLOW_COPY_AND_ASSIGN(CookieTreeChannelIDsNode);
 };
 
 // CookieTreeFlashLSONode ----------------------------------------------------
 class CookieTreeFlashLSONode : public CookieTreeNode {
  public:
   explicit CookieTreeFlashLSONode(const std::string& domain);
   virtual ~CookieTreeFlashLSONode();
 
   // CookieTreeNode methods:
   virtual void DeleteStoredObjects() OVERRIDE;
@@ skipping 78 matching lines @@
   // Methods that update the model based on the data retrieved by the browsing
   // data helpers.
   void PopulateAppCacheInfo(LocalDataContainer* container);
   void PopulateCookieInfo(LocalDataContainer* container);
   void PopulateDatabaseInfo(LocalDataContainer* container);
   void PopulateLocalStorageInfo(LocalDataContainer* container);
   void PopulateSessionStorageInfo(LocalDataContainer* container);
   void PopulateIndexedDBInfo(LocalDataContainer* container);
   void PopulateFileSystemInfo(LocalDataContainer* container);
   void PopulateQuotaInfo(LocalDataContainer* container);
-  void PopulateServerBoundCertInfo(LocalDataContainer* container);
+  void PopulateChannelIDInfo(LocalDataContainer* container);
   void PopulateFlashLSOInfo(LocalDataContainer* container);
 
   BrowsingDataCookieHelper* GetCookieHelper(const std::string& app_id);
   LocalDataContainer* data_container() {
     return data_container_.get();
   }
 
  private:
   enum CookieIconIndex {
     ORIGIN = 0,
@@ skipping 21 matching lines @@
                                             const base::string16& filter);
   void PopulateIndexedDBInfoWithFilter(LocalDataContainer* container,
                                        ScopedBatchUpdateNotifier* notifier,
                                        const base::string16& filter);
   void PopulateFileSystemInfoWithFilter(LocalDataContainer* container,
                                         ScopedBatchUpdateNotifier* notifier,
                                         const base::string16& filter);
   void PopulateQuotaInfoWithFilter(LocalDataContainer* container,
                                    ScopedBatchUpdateNotifier* notifier,
                                    const base::string16& filter);
-  void PopulateServerBoundCertInfoWithFilter(
+  void PopulateChannelIDInfoWithFilter(
       LocalDataContainer* container,
       ScopedBatchUpdateNotifier* notifier,
       const base::string16& filter);
   void PopulateFlashLSOInfoWithFilter(LocalDataContainer* container,
                                       ScopedBatchUpdateNotifier* notifier,
                                       const base::string16& filter);
 
   // Map of app ids to LocalDataContainer objects to use when retrieving
   // locally stored data.
   scoped_ptr<LocalDataContainer> data_container_;
 
   // The extension special storage policy; see ExtensionsProtectingNode() above.
   scoped_refptr<ExtensionSpecialStoragePolicy> special_storage_policy_;
 
   // The CookiesTreeModel maintains a separate list of observers that are
   // specifically of the type CookiesTreeModel::Observer.
   ObserverList<Observer> cookies_observer_list_;
 
   // If true, use the CanonicalCookie::Source attribute to group cookies.
   // Otherwise, use the CanonicalCookie::Domain attribute.
   bool group_by_cookie_source_;
 
   // If this is non-zero, then this model is batching updates (there's a lot of
   // notifications coming down the pipe). This is an integer is used to balance
   // calls to Begin/EndBatch() if they're called in a nested manner.
   int batch_update_;
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_COOKIES_TREE_MODEL_H_