Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(513)

Unified Diff: chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc

Issue 2730803002: Always clear TPM attestation keys on ChromeOS when removing media licenses (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
index ceb6cd335a27e2023b052235c74274fd24f05e4e..432895607f0cf6427243efe08ffe882ecd74acbe 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -864,8 +864,10 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
}
deauthorize_flash_content_licenses_request_id_ =
pepper_flash_settings_manager_->DeauthorizeContentLicenses(prefs);
+#endif // BUILDFLAG(ENABLE_PLUGINS)
+
#if defined(OS_CHROMEOS)
- // On Chrome OS, also delete any content protection platform keys.
+ // On Chrome OS, delete any content protection platform keys.
const user_manager::User* user =
chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
if (!user) {
@@ -883,7 +885,6 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
weak_ptr_factory_.GetWeakPtr()));
}
#endif // defined(OS_CHROMEOS)
-#endif // BUILDFLAG(ENABLE_PLUGINS)
}
//////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698