Rename ServerBoundCert => ChannelID to reflect the current name

chrome/browser/browsing_data/browsing_data_remover.h

Index: chrome/browser/browsing_data/browsing_data_remover.h
diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h
index 01b46f213d88848b905240413363c783e9977df9..d4b91d7311d3cb0cadb00f0dba544ae328a35926 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.h
+++ b/chrome/browser/browsing_data/browsing_data_remover.h
@@ -87,7 +87,7 @@ class BrowsingDataRemover
     REMOVE_PLUGIN_DATA = 1 << 9,
     REMOVE_PASSWORDS = 1 << 10,
     REMOVE_WEBSQL = 1 << 11,
-    REMOVE_SERVER_BOUND_CERTS = 1 << 12,
+    REMOVE_CHANNEL_IDS = 1 << 12,
     REMOVE_CONTENT_LICENSES = 1 << 13,
 #if defined(OS_ANDROID)
     REMOVE_APP_BANNER_DATA = 1 << 14,
@@ -109,7 +109,7 @@ class BrowsingDataRemover
 #if defined(OS_ANDROID)
                        REMOVE_APP_BANNER_DATA |
 #endif
-                       REMOVE_SERVER_BOUND_CERTS,
+                       REMOVE_CHANNEL_IDS,
 
     // Includes all the available remove options. Meant to be used by clients
     // that wish to wipe as much data as possible from a Profile, to make it
@@ -352,18 +352,18 @@ class BrowsingDataRemover
   // Invoked on the IO thread to delete cookies.
   void ClearCookiesOnIOThread(net::URLRequestContextGetter* rq_context);
 
-  // Invoked on the IO thread to delete server bound certs.
-  void ClearServerBoundCertsOnIOThread(
+  // Invoked on the IO thread to delete channel IDs.
+  void ClearChannelIDsOnIOThread(
       net::URLRequestContextGetter* rq_context);
 
-  // Callback on IO Thread when server bound certs have been deleted. Clears SSL
-  // connection pool and posts to UI thread to run OnClearedServerBoundCerts.
-  void OnClearedServerBoundCertsOnIOThread(
+  // Callback on IO Thread when channel IDs have been deleted. Clears SSL
+  // connection pool and posts to UI thread to run OnClearedChannelIDs.
+  void OnClearedChannelIDsOnIOThread(
       net::URLRequestContextGetter* rq_context);
 
-  // Callback for when server bound certs have been deleted. Invokes
+  // Callback for when channel IDs have been deleted. Invokes
   // NotifyAndDeleteIfDone.
-  void OnClearedServerBoundCerts();
+  void OnClearedChannelIDs();
 
   // Callback from the above method.
   void OnClearedFormData();
@@ -426,6 +426,7 @@ class BrowsingDataRemover
   // These may only be accessed from UI thread in order to avoid races!
   bool waiting_for_clear_autofill_origin_urls_;
   bool waiting_for_clear_cache_;
+  bool waiting_for_clear_channel_ids_;
   bool waiting_for_clear_content_licenses_;
   // Non-zero if waiting for cookies to be cleared.
   int waiting_for_clear_cookies_count_;
@@ -441,7 +442,6 @@ class BrowsingDataRemover
   bool waiting_for_clear_platform_keys_;
   bool waiting_for_clear_plugin_data_;
   bool waiting_for_clear_pnacl_cache_;
-  bool waiting_for_clear_server_bound_certs_;
   bool waiting_for_clear_storage_partition_data_;
 #if defined(ENABLE_WEBRTC)
   bool waiting_for_clear_webrtc_logs_;