Move rest of param validation in browsing_data_api.cc to ::RunAsync.

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 235 matching lines @@
 
 bool BrowsingDataRemoverFunction::RunAsync() {
   // If we don't have a profile, something's pretty wrong.
   DCHECK(GetProfile());
 
   // Grab the initial |options| parameter, and parse out the arguments.
   base::DictionaryValue* options;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &options));
   DCHECK(options);
 
-  origin_type_mask_ = ParseOriginTypeMask(*options);
+  EXTENSION_FUNCTION_VALIDATE(
+      ParseOriginTypeMask(*options, &origin_type_mask_));
 
   // 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
@@ skipping 49 matching lines @@
   // 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.
   observer_.Add(remover);
   remover->RemoveAndReply(
       remove_since_, base::Time::Max(),
       removal_mask_, origin_type_mask_, this);
 }
 
-int BrowsingDataRemoverFunction::ParseOriginTypeMask(
-    const base::DictionaryValue& options) {
+bool BrowsingDataRemoverFunction::ParseOriginTypeMask(
+    const base::DictionaryValue& options,
+    int* origin_type_mask) {
   // 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;
+  *origin_type_mask = BrowsingDataHelper::UNPROTECTED_WEB;
 
   const base::DictionaryValue* d = NULL;
   if (options.HasKey(extension_browsing_data_api_constants::kOriginTypesKey)) {
-    EXTENSION_FUNCTION_VALIDATE(options.GetDictionary(
-        extension_browsing_data_api_constants::kOriginTypesKey, &d));
+    if (!options.GetDictionary(
+            extension_browsing_data_api_constants::kOriginTypesKey, &d)) {
+      return false;
+    }
     bool value;
 
     // The developer specified something! Reset to 0 and parse the dictionary.
-    mask = 0;
+    *origin_type_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;
+      if (!d->GetBoolean(
+              extension_browsing_data_api_constants::kUnprotectedWebKey,
+              &value)) {
+        return false;
+      }
+      *origin_type_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;
+      if (!d->GetBoolean(
+              extension_browsing_data_api_constants::kProtectedWebKey,
+              &value)) {
+        return false;
+      }
+      *origin_type_mask |= value ? BrowsingDataHelper::PROTECTED_WEB : 0;
     }
 
     // Extensions.
     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;
+      if (!d->GetBoolean(extension_browsing_data_api_constants::kExtensionsKey,
+                         &value)) {
+        return false;
+      }
+      *origin_type_mask |= value ? BrowsingDataHelper::EXTENSION : 0;
     }
   }
 
-  return mask;
+  return true;
 }
 
 // Parses the |dataToRemove| argument to generate the removal mask.
 // Returns false if parse was not successful, i.e. if 'dataToRemove' is not
 // present or any data-type keys don't have supported (boolean) values.
 bool BrowsingDataRemoveFunction::GetRemovalMask(int* removal_mask) {
   base::DictionaryValue* data_to_remove;
   if (!args_->GetDictionary(1, &data_to_remove))
     return false;
 
@@ skipping 75 matching lines @@
 
 bool BrowsingDataRemoveCacheStorageFunction::GetRemovalMask(int* removal_mask) {
   *removal_mask = BrowsingDataRemover::REMOVE_CACHE_STORAGE;
   return true;
 }
 
 bool BrowsingDataRemoveWebSQLFunction::GetRemovalMask(int* removal_mask) {
   *removal_mask = BrowsingDataRemover::REMOVE_WEBSQL;
   return true;
 }