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

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

It's a bit cleaner to call EXTENSION_FUNCTION_VALIDATE directly from ::Run*.
(ab)using EXTENSION_FUNCTION_VALIDATE's implicit bool conversion as
return value for non-Run* functions is discouraged.

BUG=648275
Test=None

Review-Url: https://codereview.chromium.org/2654113003
Cr-Commit-Position: refs/heads/master@{#446883}
Committed: https://chromium.googlesource.com/chromium/src/+/9bfcba8467532d955f1178b70c4e3b88e6e5f23e

[lazyboy, 2017-01-27 03:35:33]

Description was changed from

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

It's a bit cleaner to call EXTENSION_FUNCION_VALIDATE directly from ::Run*.

BUG=648275
Test=None
==========

to

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

It's a bit cleaner to call EXTENSION_FUNCTION_VALIDATE directly from ::Run*.
(ab)using EXTENSION_FUNCTION_VALIDATE's implicit bool conversion as
return value for non-Run* functions is discouraged.

BUG=648275
Test=None
==========

[lazyboy, 2017-01-27 03:36:21]

lazyboy@chromium.org changed reviewers:
+ rdevlin.cronin@chromium.org

[Devlin, 2017-01-27 17:44:06]

lgtm

[lazyboy, 2017-01-27 18:12:40]

The CQ bit was checked by lazyboy@chromium.org

[commit-bot: I haz the power, 2017-01-27 18:13:04]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-27 19:57:52]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-27 19:57:53]

Failed to apply patch for
chrome/browser/extensions/api/browsing_data/browsing_data_api.cc:
While running git apply --index -p1;
  error: patch failed:
chrome/browser/extensions/api/browsing_data/browsing_data_api.cc:325
  error: chrome/browser/extensions/api/browsing_data/browsing_data_api.cc: patch
does not apply

Patch:       chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
Index: chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
index
9b4e4a186ec12a21b4c2acf23615d60f5cb8c11a..fffe62009e4ac1e888605a58c0f50d2c5c1e6675
100644
--- a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
+++ b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
@@ -253,7 +253,8 @@ bool BrowsingDataRemoverFunction::RunAsync() {
   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;
@@ -325,44 +326,55 @@ void BrowsingDataRemoverFunction::StartRemoving() {
       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. Sets

[lazyboy, 2017-01-28 01:18:11]

The CQ bit was checked by lazyboy@chromium.org

[lazyboy, 2017-01-28 01:18:11]

The patchset sent to the CQ was uploaded after l-g-t-m from
rdevlin.cronin@chromium.org
Link to the patchset: https://codereview.chromium.org/2654113003/#ps20001
(title: "sync")

[commit-bot: I haz the power, 2017-01-28 01:18:35]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-28 02:08:59]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1485566291270880,
"parent_rev": "01fea95b3e06b6b270b816e798e03a7995589d1a", "commit_rev":
"9bfcba8467532d955f1178b70c4e3b88e6e5f23e"}

[commit-bot: I haz the power, 2017-01-28 02:09:46]

Description was changed from

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

It's a bit cleaner to call EXTENSION_FUNCTION_VALIDATE directly from ::Run*.
(ab)using EXTENSION_FUNCTION_VALIDATE's implicit bool conversion as
return value for non-Run* functions is discouraged.

BUG=648275
Test=None
==========

to

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

It's a bit cleaner to call EXTENSION_FUNCTION_VALIDATE directly from ::Run*.
(ab)using EXTENSION_FUNCTION_VALIDATE's implicit bool conversion as
return value for non-Run* functions is discouraged.

BUG=648275
Test=None

Review-Url: https://codereview.chromium.org/2654113003
Cr-Commit-Position: refs/heads/master@{#446883}
Committed:
https://chromium.googlesource.com/chromium/src/+/9bfcba8467532d955f1178b70c4e...
==========

[commit-bot: I haz the power, 2017-01-28 02:09:48]

Committed patchset #2 (id:20001) as
https://chromium.googlesource.com/chromium/src/+/9bfcba8467532d955f1178b70c4e...