Change Origin bound certs -> Domain bound certs.

chrome/browser/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_REMOVER_H_
 #define CHROME_BROWSER_BROWSING_DATA_REMOVER_H_
 #pragma once
 
 #include <set>
 
@@ skipping 54 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_ORIGIN_BOUND_CERTS = 1 << 12,
+    REMOVE_SERVER_BOUND_CERTS = 1 << 12,
 
     // "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 |
-                       REMOVE_ORIGIN_BOUND_CERTS
+                       REMOVE_SERVER_BOUND_CERTS
   };
 
   // When BrowsingDataRemover successfully removes data, a notification of type
   // NOTIFICATION_BROWSING_DATA_REMOVED is triggered with a Details object of
   // this type.
   struct NotificationDetails {
     NotificationDetails();
     NotificationDetails(const NotificationDetails& details);
     NotificationDetails(base::Time removal_begin,
                        int removal_mask);
@@ skipping 135 matching lines @@
   // Completion handler that runs on the UI thread once persistent data has been
   // deleted. Updates the waiting flag and invokes NotifyAndDeleteIfDone.
   void OnQuotaManagedDataDeleted();
 
   // Callback 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 origin bound certs.
-  void ClearOriginBoundCertsOnIOThread(
+  // Invoked on the IO thread to delete server bound certs.
+  void ClearServerBoundCertsOnIOThread(
       net::URLRequestContextGetter* rq_context);
 
-  // Callback when origin bound certs have been deleted. Invokes
+  // Callback when server bound certs have been deleted. Invokes
   // NotifyAndDeleteIfDone.
-  void OnClearedOriginBoundCerts();
+  void OnClearedServerBoundCerts();
 
   // Calculate the begin time for the deletion range specified by |time_period|.
   base::Time CalculateBeginDeleteTime(TimePeriod time_period);
 
   // Returns true if we're all done.
   bool all_done() {
     return registrar_.IsEmpty() && !waiting_for_clear_cache_ &&
            !waiting_for_clear_cookies_count_&&
            !waiting_for_clear_history_ &&
            !waiting_for_clear_networking_history_ &&
-           !waiting_for_clear_origin_bound_certs_ &&
+           !waiting_for_clear_server_bound_certs_ &&
            !waiting_for_clear_plugin_data_ &&
            !waiting_for_clear_quota_managed_data_;
   }
 
   // Setter for removing_; DCHECKs that we can only start removing if we're not
   // already removing, and vice-versa.
   static void set_removing(bool removing);
 
   content::NotificationRegistrar registrar_;
 
@@ skipping 27 matching lines @@
   scoped_ptr<content::PluginDataRemover> plugin_data_remover_;
   base::WaitableEventWatcher watcher_;
 
   // 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_cache_;
   // Non-zero if waiting for cookies to be cleared.
   int waiting_for_clear_cookies_count_;
   bool waiting_for_clear_history_;
   bool waiting_for_clear_networking_history_;
-  bool waiting_for_clear_origin_bound_certs_;
+  bool waiting_for_clear_server_bound_certs_;
   bool waiting_for_clear_plugin_data_;
   bool waiting_for_clear_quota_managed_data_;
 
   // Tracking how many origins need to be deleted, and whether we're finished
   // gathering origins.
   int quota_managed_origins_to_delete_count_;
   int quota_managed_storage_types_to_delete_count_;
 
   // The removal mask for the current removal operation.
   int remove_mask_;
 
   // The origin for the current removal operation.
   GURL remove_origin_;
 
   // Should data for protected origins be removed?
   bool remove_protected_;
 
   ObserverList<Observer> observer_list_;
 
   // Used if we need to clear history.
   CancelableRequestConsumer request_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_REMOVER_H_