Check whether clearing LSO data is supported in clients of the BrowsingDataRemover.

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 c4223566b070c6087d86ebaeb9f790b6007a4abf..acca585d654c2c8c1e9cc606d1c004fa63906505 100644
--- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
+++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
@@ -103,8 +103,13 @@ void ClearBrowserDataHandler::HandleClearBrowserData(const ListValue* value) {
     remove_mask |= BrowsingDataRemover::REMOVE_DOWNLOADS;
   if (prefs->GetBoolean(prefs::kDeleteCache))
     remove_mask |= BrowsingDataRemover::REMOVE_CACHE;
-  if (prefs->GetBoolean(prefs::kDeleteCookies))
-    remove_mask |= BrowsingDataRemover::REMOVE_SITE_DATA;
+  if (prefs->GetBoolean(prefs::kDeleteCookies)) {
+    int site_data_mask = BrowsingDataRemover::REMOVE_SITE_DATA;
+    // Don't try to clear LSO data if it's not supported.
+    if (!*clear_plugin_lso_data_enabled_)
+      site_data_mask &= ~BrowsingDataRemover::REMOVE_LSO_DATA;

[Mike West, 2011/10/10 18:50:23]

Here too.

+    remove_mask |= site_data_mask;
+  }
   if (prefs->GetBoolean(prefs::kDeletePasswords))
     remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
   if (prefs->GetBoolean(prefs::kDeleteFormData))