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

chrome/browser/extensions/extension_clear_api.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.
 
 // Defines the Chrome Extensions Clear API functions, which entail
 // clearing browsing data, and clearing the browser's cache (which, let's be
 // honest, are the same thing), as specified in
 // chrome/common/extensions/api/extension_api.json.
 
 #include "chrome/browser/extensions/extension_clear_api.h"
 
 #include <string>
 
 #include "base/values.h"
 #include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/extensions/extension_clear_api_constants.h"
+#include "chrome/browser/plugin_data_remover.h"
+#include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "content/browser/browser_thread.h"
 
 namespace keys = extension_clear_api_constants;
 
 namespace {
 
@@ skipping 61 matching lines @@
 }
 
 bool BrowsingDataExtensionFunction::RunImpl() {
   if (BrowsingDataRemover::is_removing()) {
     error_ = keys::kOneAtATimeError;
     return false;
   }
 
   // Parse the |timeframe| argument to generate the TimePeriod.
   std::string timeframe;
-  BrowsingDataRemover::TimePeriod period;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &timeframe));
-  EXTENSION_FUNCTION_VALIDATE(ParseTimePeriod(timeframe, &period));
+  EXTENSION_FUNCTION_VALIDATE(ParseTimePeriod(timeframe, &period_));
 
+  removal_mask_ = GetRemovalMask();
+
+  if (removal_mask_ & ~BrowsingDataRemover::REMOVE_LSO_DATA) {

[Mike West, 2011/10/10 18:41:11]

I think taking the one's complement here is backwards. You want to check if the
bit is set, right?

[Bernhard Bauer, 2011/10/11 13:52:58]

Indeed, that was a copy-and-paste from below :) Thanks for catching it!

+    // If we're being asked to remove LSO data, check whether it's actually
+    // supported.
+    Profile* profile = GetCurrentBrowser()->profile();
+    BrowserThread::PostTask(
+        BrowserThread::FILE, FROM_HERE,
+        base::Bind(
+            &BrowsingDataExtensionFunction::CheckRemovingLSODataSupported,
+            this,
+            make_scoped_refptr(PluginPrefs::GetForProfile(profile))));
+  } else {
+    StartRemoving();
+  }
+
+  // Will finish asynchronously.
+  return true;
+}
+
+void BrowsingDataExtensionFunction::CheckRemovingLSODataSupported(
+    scoped_refptr<PluginPrefs> plugin_prefs) {
+  if (!PluginDataRemover::IsSupported(plugin_prefs))
+    removal_mask_ &= ~BrowsingDataRemover::REMOVE_LSO_DATA;

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

XOR might be clearer? I had to think about what this meant, though that's likely
just personal preference.

[Bernhard Bauer, 2011/10/11 13:52:58]

I think a bitwise "and" is the usual way to flip a bit to off, and there is no
way, that it can accidentally turn it on instead :)

+
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&BrowsingDataExtensionFunction::StartRemoving, this));
+}
+
+void BrowsingDataExtensionFunction::StartRemoving() {
   // If we're good to go, add a ref (Balanced in OnBrowsingDataRemoverDone)
   AddRef();
 
   // Create a BrowsingDataRemover, set the current object as an observer (so
   // that we're notified after removal) and call remove() with the arguments
   // we've generated above. We can use a raw pointer here, as the browsing data
   // remover is responsible for deleting itself once data removal is complete.
   BrowsingDataRemover* remover = new BrowsingDataRemover(
-      GetCurrentBrowser()->profile(), period, base::Time::Now());
+      GetCurrentBrowser()->profile(), period_, base::Time::Now());
   remover->AddObserver(this);
-  remover->Remove(GetRemovalMask());
-
-  // Will finish asynchronously.
-  return true;
+  remover->Remove(removal_mask_);
 }
 
 int ClearBrowsingDataFunction::GetRemovalMask() const {
   // Parse the |dataToRemove| argument to generate the removal mask.
   base::DictionaryValue* data_to_remove;
   if (args_->GetDictionary(1, &data_to_remove))
     return ParseRemovalMask(data_to_remove);
   else
     return 0;
 }
@@ skipping 14 matching lines @@
   return BrowsingDataRemover::REMOVE_FORM_DATA;
 }
 
 int ClearHistoryFunction::GetRemovalMask() const {
   return BrowsingDataRemover::REMOVE_HISTORY;
 }
 
 int ClearPasswordsFunction::GetRemovalMask() const {
   return BrowsingDataRemover::REMOVE_CACHE;
 }