[Autofill] Cleaned up autofill validation functions.

This cosmetic CL rewrites the validation functions
for autofill data in a declarative way.

Bug: 1007974
Change-Id: I99f8171caf67b3ebc711afe2cc231f73eb310684
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2440873Reviewed-by: Matthias Körber <koerber@google.com>
Commit-Queue: Christoph Schwering <schwering@google.com>
Cr-Commit-Position: refs/heads/master@{#830618}

components/autofill/core/common/autofill_data_validation.cc

@@ -4,6 +4,7 @@
 
 #include "components/autofill/core/common/autofill_data_validation.h"
 
+#include "base/ranges/algorithm.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
@@ -38,60 +39,29 @@ bool IsValidFormFieldData(const FormFieldData& field) {
 }
 
 bool IsValidFormData(const FormData& form) {
-  if (!IsValidString16(form.name) || !IsValidGURL(form.url) ||
-      !IsValidGURL(form.action))
-    return false;
-
-  if (form.fields.size() > kMaxListSize)
-    return false;
-
-  for (const FormFieldData& field : form.fields) {
-    if (!IsValidFormFieldData(field))
-      return false;
-  }
-
-  return true;
+  return IsValidString16(form.name) && IsValidGURL(form.url) &&
+         IsValidGURL(form.action) && form.fields.size() <= kMaxListSize &&
+         base::ranges::all_of(form.fields, &IsValidFormFieldData);
 }
 
 bool IsValidPasswordFormFillData(const PasswordFormFillData& form) {
-  if (!IsValidString16(form.name) || !IsValidGURL(form.url) ||
-      !IsValidGURL(form.action) || !IsValidFormFieldData(form.username_field) ||
-      !IsValidFormFieldData(form.password_field) ||
-      !IsValidString(form.preferred_realm)) {
-    return false;
-  }
-
-  for (const auto& it : form.additional_logins) {
-    if (!IsValidString16(it.username) || !IsValidString16(it.password) ||
-        !IsValidString(it.realm))
-      return false;
-  }
-
-  return true;
+  return IsValidString16(form.name) && IsValidGURL(form.url) &&
+         IsValidGURL(form.action) &&
+         IsValidFormFieldData(form.username_field) &&
+         IsValidFormFieldData(form.password_field) &&
+         IsValidString(form.preferred_realm) &&
+         base::ranges::all_of(form.additional_logins, [](const auto& login) {
+           return IsValidString16(login.username) &&
+                  IsValidString16(login.password) && IsValidString(login.realm);
+         });
 }
 
 bool IsValidString16Vector(const std::vector<base::string16>& v) {
-  if (v.size() > kMaxListSize)
-    return false;
-
-  for (const base::string16& str : v) {
-    if (!IsValidString16(str))
-      return false;
-  }
-
-  return true;
+  return v.size() <= kMaxListSize && base::ranges::all_of(v, &IsValidString16);
 }
 
 bool IsValidFormDataVector(const std::vector<FormData>& v) {
-  if (v.size() > kMaxListSize)
-    return false;
-
-  for (const FormData& form : v) {
-    if (!IsValidFormData(form))
-      return false;
-  }
-
-  return true;
+  return v.size() <= kMaxListSize && base::ranges::all_of(v, &IsValidFormData);
 }
 
 }  // namespace autofill