`chrome.browsingData` extension API can now remove data from protected origins.

chrome/browser/extensions/api/browsing_data/browsing_data_api.cc

 // Copyright (c) 2012 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 BrowsingData 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 the extension API JSON.
 
 #include "chrome/browser/extensions/api/browsing_data/browsing_data_api.h"
 
@@ skipping 23 matching lines @@
 const char kFormDataKey[] = "formData";
 const char kHistoryKey[] = "history";
 const char kIndexedDBKey[] = "indexedDB";
 const char kLocalStorageKey[] = "localStorage";
 const char kServerBoundCertsKey[] = "serverBoundCerts";
 const char kPasswordsKey[] = "passwords";
 const char kPluginDataKey[] = "pluginData";
 const char kWebSQLKey[] = "webSQL";
 
 // Option Keys.
+const char kExtensionsKey[] = "extensions";
+const char kOriginTypesKey[] = "origin_types";
+const char kProtectedWebKey[] = "protected_web";
 const char kSinceKey[] = "since";
+const char kUnprotectedWebKey[] = "unprotected_web";
 
 // Errors!
-const char kOneAtATimeError[] = "Only one 'browsingData' API call can run at"
+const char kOneAtATimeError[] = "Only one 'browsingData' API call can run at "
                                 "a time.";
 
 }  // namespace extension_browsing_data_api_constants
 
 namespace {
 // Converts the JavaScript API's numeric input (miliseconds since epoch) into an
 // appropriate base::Time that we can pass into the BrowsingDataRemove.
 bool ParseTimeFromValue(const double& ms_since_epoch, base::Time* time) {
   return true;
 }
@@ skipping 37 matching lines @@
   if (RemoveType(value, extension_browsing_data_api_constants::kPasswordsKey))
     GetRemovalMask |= BrowsingDataRemover::REMOVE_PASSWORDS;
   if (RemoveType(value, extension_browsing_data_api_constants::kPluginDataKey))
     GetRemovalMask |= BrowsingDataRemover::REMOVE_PLUGIN_DATA;
   if (RemoveType(value, extension_browsing_data_api_constants::kWebSQLKey))
     GetRemovalMask |= BrowsingDataRemover::REMOVE_WEBSQL;
 
   return GetRemovalMask;
 }
 
-}  // Namespace.
+}  // namespace
 
 void BrowsingDataExtensionFunction::OnBrowsingDataRemoverDone() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   this->SendResponse(true);
 
   Release();  // Balanced in RunImpl.
 }
 
 bool BrowsingDataExtensionFunction::RunImpl() {
   if (BrowsingDataRemover::is_removing()) {
     error_ = extension_browsing_data_api_constants::kOneAtATimeError;
     return false;
   }
 
   // Grab the initial |options| parameter, and parse out the arguments.
   DictionaryValue* options;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &options));
   DCHECK(options);
 
+  origin_set_mask_ = ParseOriginSetMask(*options);
+
   // If |ms_since_epoch| isn't set, default it to 0.
   double ms_since_epoch;
   if (!options->GetDouble(extension_browsing_data_api_constants::kSinceKey,
                           &ms_since_epoch))
     ms_since_epoch = 0;
 
   // base::Time takes a double that represents seconds since epoch. JavaScript
   // gives developers milliseconds, so do a quick conversion before populating
   // the object. Also, Time::FromDoubleT converts double time 0 to empty Time
   // object. So we need to do special handling here.
@@ skipping 35 matching lines @@
   // 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(), remove_since_, base::Time::Now());
   remover->AddObserver(this);
-  remover->Remove(removal_mask_, BrowsingDataHelper::UNPROTECTED_WEB);
+  remover->Remove(removal_mask_, origin_set_mask_);
+}
+
+int BrowsingDataExtensionFunction::ParseOriginSetMask(
+    const base::DictionaryValue& options) {
+  // Parse the |options| dictionary to generate the origin set mask. Default to
+  // UNPROTECTED_WEB if the developer doesn't specify anything.
+  int mask = BrowsingDataHelper::UNPROTECTED_WEB;
+
+  DictionaryValue* d = NULL;
+  if (options.HasKey(extension_browsing_data_api_constants::kOriginTypesKey)) {
+    EXTENSION_FUNCTION_VALIDATE(options.GetDictionary(
+        extension_browsing_data_api_constants::kOriginTypesKey, &d));
+    bool value;
+
+    // The developer specified something! Reset to 0 and parse the dictionary.
+    mask = 0;
+
+    // Unprotected web.
+    if (d->HasKey(extension_browsing_data_api_constants::kUnprotectedWebKey)) {
+      EXTENSION_FUNCTION_VALIDATE(d->GetBoolean(
+          extension_browsing_data_api_constants::kUnprotectedWebKey, &value));
+      mask |= value ? BrowsingDataHelper::UNPROTECTED_WEB : 0;
+    }
+
+    // Protected web.
+    if (d->HasKey(extension_browsing_data_api_constants::kProtectedWebKey)) {
+      EXTENSION_FUNCTION_VALIDATE(d->GetBoolean(
+          extension_browsing_data_api_constants::kProtectedWebKey, &value));
+      mask |= value ? BrowsingDataHelper::PROTECTED_WEB : 0;
+    }
+
+    // Extensions.
+    // TODO(mkwst): Decide whether we should expose this to the extension API.

[Mihai Parparita -not on Chrome, 2012/06/13 19:48:54]

Seems reasonable to expose this.

+    // One way or the other, remove this comment before commiting.
+    /*
+    if (d->HasKey(extension_browsing_data_api_constants::kExtensionsKey)) {
+      EXTENSION_FUNCTION_VALIDATE(d->GetBoolean(
+          extension_browsing_data_api_constants::kExtensionsKey, &value));
+      mask |= value ? BrowsingDataHelper::EXTENSION : 0;
+    }
+    */
+  }
+
+  return mask;
 }
 
 int RemoveBrowsingDataFunction::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 42 matching lines @@
   return BrowsingDataRemover::REMOVE_PLUGIN_DATA;
 }
 
 int RemovePasswordsFunction::GetRemovalMask() const {
   return BrowsingDataRemover::REMOVE_PASSWORDS;
 }
 
 int RemoveWebSQLFunction::GetRemovalMask() const {
   return BrowsingDataRemover::REMOVE_WEBSQL;
 }