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

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

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/ui/webui/options/clear_browser_data_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/string16.h"
@@ skipping 85 matching lines @@
   Profile* profile = Profile::FromWebUI(web_ui_);
   PrefService* prefs = profile->GetPrefs();
 
   int remove_mask = 0;
   if (prefs->GetBoolean(prefs::kDeleteBrowsingHistory))
     remove_mask |= BrowsingDataRemover::REMOVE_HISTORY;
   if (prefs->GetBoolean(prefs::kDeleteDownloadHistory))
     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))
     remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
 
   int period_selected = prefs->GetInteger(prefs::kDeleteTimePeriod);
 
   base::FundamentalValue state(true);
   web_ui_->CallJavascriptFunction("ClearBrowserDataOverlay.setClearingState",
                                   state);
@@ skipping 11 matching lines @@
   remover_->Remove(remove_mask);
 }
 
 void ClearBrowserDataHandler::OnBrowsingDataRemoverDone() {
   // No need to remove ourselves as an observer as BrowsingDataRemover deletes
   // itself after we return.
   remover_ = NULL;
   DCHECK(web_ui_);
   web_ui_->CallJavascriptFunction("ClearBrowserDataOverlay.doneClearing");
 }