UI Changes to support clearing EME/CDM data

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 <stdint.h>
 
 #include <set>
@@ skipping 449 matching lines @@
   // Used to deauthorize content licenses for Pepper Flash.
   std::unique_ptr<PepperFlashSettingsManager> pepper_flash_settings_manager_;
 #endif
 
   uint32_t deauthorize_content_licenses_request_id_ = 0;
   // 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_ = false;
   bool waiting_for_clear_cache_ = false;
   bool waiting_for_clear_channel_ids_ = false;
-  bool waiting_for_clear_content_licenses_ = false;
+  bool waiting_for_clear_flash_content_licenses_ = false;
   // Non-zero if waiting for cookies to be cleared.
   int waiting_for_clear_cookies_count_ = 0;
   bool waiting_for_clear_domain_reliability_monitor_ = false;
   bool waiting_for_clear_form_ = false;
   bool waiting_for_clear_history_ = false;
   bool waiting_for_clear_hostname_resolution_cache_ = false;
   bool waiting_for_clear_keyword_data_ = false;
   bool waiting_for_clear_nacl_cache_ = false;
   bool waiting_for_clear_network_predictor_ = false;
   bool waiting_for_clear_networking_history_ = false;
@@ skipping 35 matching lines @@
   // not initialised, so the registry must be mocked out.
   std::unique_ptr<WebappRegistry> webapp_registry_;
 #endif
 
   base::WeakPtrFactory<BrowsingDataRemover> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_