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 66de001126acf7d61596ffa525e7fc24cecfb6ac..625e93d7bdf647cf4a51dc384ac5d4772826b7ef 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
@@ -353,17 +353,17 @@ class BrowsingDataRemover
   void ClearCookiesOnIOThread(net::URLRequestContextGetter* rq_context);
 
   // Invoked on the IO thread to delete server bound certs.

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

You can search for "cert" in this file and fix all occurrences of "server bound
cert".

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

Done.

-  void ClearServerBoundCertsOnIOThread(
+  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(
+  // 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
   // NotifyAndDeleteIfDone.
-  void OnClearedServerBoundCerts();
+  void OnClearedChannelIDs();
 
   // Callback from the above method.
   void OnClearedFormData();
@@ -441,7 +441,7 @@ 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_channel_ids_;

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

These are listed in alphabetical order. If this hasn't driven you crazy, you can
sort these.

This will require updating the constructor's initializer list in the .cc file.

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

Done.

   bool waiting_for_clear_storage_partition_data_;
 #if defined(ENABLE_WEBRTC)
   bool waiting_for_clear_webrtc_logs_;