Rename ServerBoundCert => ChannelID to reflect the current name

chrome/browser/browsing_data/browsing_data_remover.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_BROWSING_DATA_REMOVER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 
 #include <set>
 
 #include "base/gtest_prod_util.h"
@@ skipping 69 matching lines @@
     REMOVE_DOWNLOADS = 1 << 3,
     REMOVE_FILE_SYSTEMS = 1 << 4,
     REMOVE_FORM_DATA = 1 << 5,
     // In addition to visits, REMOVE_HISTORY removes keywords and last session.
     REMOVE_HISTORY = 1 << 6,
     REMOVE_INDEXEDDB = 1 << 7,
     REMOVE_LOCAL_STORAGE = 1 << 8,
     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,
 #endif
     // The following flag is used only in tests. In normal usage, hosted app
     // data is controlled by the REMOVE_COOKIES flag, applied to the
     // protected-web origin.
     REMOVE_HOSTED_APP_DATA_TESTONLY = 1 << 31,
 
     // "Site data" includes cookies, appcache, file systems, indexedDBs, local
     // storage, webSQL, and plugin data.
     REMOVE_SITE_DATA = REMOVE_APPCACHE |
                        REMOVE_COOKIES |
                        REMOVE_FILE_SYSTEMS |
                        REMOVE_INDEXEDDB |
                        REMOVE_LOCAL_STORAGE |
                        REMOVE_PLUGIN_DATA |
                        REMOVE_WEBSQL |
 #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
     // look like a new Profile.
     REMOVE_ALL = REMOVE_SITE_DATA |
                  REMOVE_CACHE |
                  REMOVE_DOWNLOADS |
                  REMOVE_FORM_DATA |
                  REMOVE_HISTORY |
                  REMOVE_PASSWORDS |
@@ skipping 222 matching lines @@
   // Invoked on the IO thread to delete entries in the PNaCl translation cache.
   void ClearPnaclCacheOnIOThread(base::Time begin, base::Time end);
 #endif
 
   // Callback for when Cookies has been deleted. Invokes NotifyAndDeleteIfDone.
   void OnClearedCookies(int num_deleted);
 
   // 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();
 
   // Callback for when the Autofill profile and credit card origin URLs have
   // been deleted.
   void OnClearedAutofillOriginURLs();
 
   // Callback on UI thread when the storage partition related data are cleared.
   void OnClearedStoragePartitionData();
@@ skipping 42 matching lines @@
 
   // Used to deauthorize content licenses for Pepper Flash.
   scoped_ptr<PepperFlashSettingsManager> pepper_flash_settings_manager_;
 #endif
 
   uint32 deauthorize_content_licenses_request_id_;
   // True if we're waiting for various data to be deleted.
   // 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_;
   bool waiting_for_clear_domain_reliability_monitor_;
   bool waiting_for_clear_form_;
   bool waiting_for_clear_history_;
   bool waiting_for_clear_hostname_resolution_cache_;
   bool waiting_for_clear_keyword_data_;
   bool waiting_for_clear_logged_in_predictor_;
   bool waiting_for_clear_nacl_cache_;
   bool waiting_for_clear_network_predictor_;
   bool waiting_for_clear_networking_history_;
   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_;
 #endif
 
   // The removal mask for the current removal operation.
   int remove_mask_;
 
   // The origin for the current removal operation.
   GURL remove_origin_;
 
   // From which types of origins should we remove data?
   int origin_set_mask_;
 
   ObserverList<Observer> observer_list_;
 
   // Used if we need to clear history.
   base::CancelableTaskTracker history_task_tracker_;
 
   scoped_ptr<TemplateURLService::Subscription> template_url_sub_;
 
   // We do not own this.
   content::StoragePartition* storage_partition_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_