Sanity checks to make sure we are not trying to clear Content Licenses when Flash Pepper is not in …

chrome/browser/ui/webui/options/clear_browser_data_handler.cc

Index: chrome/browser/ui/webui/options/clear_browser_data_handler.cc
diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
index d1bd73e1846435aae87159da938b6bc6732cbe27..c92acec880542696e70937af7cb0e170b9f695d5 100644
--- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
+++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
@@ -43,6 +43,9 @@ void ClearBrowserDataHandler::InitializeHandler() {
   clear_plugin_lso_data_enabled_.Init(prefs::kClearPluginLSODataEnabled,
                                       Profile::FromWebUI(web_ui())->GetPrefs(),
                                       NULL);
+  pepper_flash_settings_enabled_.Init(prefs::kPepperFlashSettingsEnabled,
+                                      Profile::FromWebUI(web_ui())->GetPrefs(),
+                                      NULL);
 }
 
 void ClearBrowserDataHandler::GetLocalizedValues(
@@ -135,7 +138,9 @@ void ClearBrowserDataHandler::HandleClearBrowserData(const ListValue* value) {
     remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
   if (prefs->GetBoolean(prefs::kDeleteFormData))
     remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
-  if (prefs->GetBoolean(prefs::kDeauthorizeContentLicenses))
+  // Clearing Content Licenses is only supported in Pepper Flash.
+  if (prefs->GetBoolean(prefs::kDeauthorizeContentLicenses) &&
+      *pepper_flash_settings_enabled_)

[Evan Stade, 2012/10/01 08:45:39]

curlies

[engedy, 2012/10/01 08:53:00]

Done.

     remove_mask |= BrowsingDataRemover::REMOVE_CONTENT_LICENSES;
   if (prefs->GetBoolean(prefs::kDeleteHostedAppsData)) {
     remove_mask |= site_data_mask;