[PasswordGeneration] Improve change/confirm password field detection.

components/autofill/content/renderer/password_form_conversion_utils.cc

 // Copyright 2013 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.
 
 #include "components/autofill/content/renderer/password_form_conversion_utils.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 722 matching lines @@
                        field_value_and_properties_map, form_predictions))
     return std::unique_ptr<PasswordForm>();
 
   // No actual action on the form, so use the the origin as the action.
   password_form->action = password_form->origin;
 
   return password_form;
 }
 
 bool HasAutocompleteAttributeValue(const blink::WebInputElement& element,
-                                   const char* value_in_lowercase) {
-  std::string autocomplete_value_lowercase = base::ToLowerASCII(
-      base::UTF16ToUTF8(element.GetAttribute("autocomplete").Utf16()));
+                                   base::StringPiece value_in_lowercase) {
+  CR_DEFINE_STATIC_LOCAL(WebString, kAutocomplete, ("autocomplete"));
+  const std::string autocomplete_value =
+      element.GetAttribute(kAutocomplete)
+          .Utf8(WebString::UTF8ConversionMode::kStrictReplacingErrorsWithFFFD);
 
-  std::vector<base::StringPiece> tokens = base::SplitStringPiece(
-      autocomplete_value_lowercase, base::kWhitespaceASCII,
-      base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
-
-  return base::ContainsValue(tokens, value_in_lowercase);
+  std::vector<base::StringPiece> tokens =
+      base::SplitStringPiece(autocomplete_value, base::kWhitespaceASCII,
+                             base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
+  return std::find_if(tokens.begin(), tokens.end(),
+                      [value_in_lowercase](base::StringPiece token) {

[dvadym, 2017/06/09 11:39:48]

Nit: it looks that you can avoid copying value_in_lowercase and token, by
value_in_lowercase -> const value_in_lowercase& and base::StringPiece -> const
base::StringPiece&

[pkalinnikov, 2017/06/09 11:53:23]

I assume you mean [value_in_lowercase](base::StringPiece token) ->
[&value_in_lowercase](const base::StringPiece& token).
I vaguely remember there has been a discussion, according to which
base::StringPiece should be passed by value.

Moreover, I expect this find_if code anyway optimized by the compiler.

[dvadym, 2017/06/09 11:59:25]

Acknowledged

+                        return base::LowerCaseEqualsASCII(token,
+                                                          value_in_lowercase);
+                      }) != tokens.end();
 }
 
 bool HasCreditCardAutocompleteAttributes(
     const blink::WebInputElement& element) {
-  std::string autocomplete_value_lowercase = base::ToLowerASCII(
-      base::UTF16ToUTF8(element.GetAttribute("autocomplete").Utf16()));
+  CR_DEFINE_STATIC_LOCAL(WebString, kAutocomplete, ("autocomplete"));
+  const std::string autocomplete_value =
+      element.GetAttribute(kAutocomplete)
+          .Utf8(WebString::UTF8ConversionMode::kStrictReplacingErrorsWithFFFD);
 
-  for (const auto& token : base::SplitStringPiece(
-           autocomplete_value_lowercase, base::kWhitespaceASCII,
-           base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) {
-    if (base::StartsWith(token, kAutocompleteCreditCardPrefix,
-                         base::CompareCase::SENSITIVE)) {
-      return true;
-    }
-  }
-  return false;
+  std::vector<base::StringPiece> tokens =
+      base::SplitStringPiece(autocomplete_value, base::kWhitespaceASCII,
+                             base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
+  return std::find_if(
+             tokens.begin(), tokens.end(), [](base::StringPiece token) {

[dvadym, 2017/06/09 11:39:47]

Nit: base::StringPiece -> const base::StringPiece&

[pkalinnikov, 2017/06/09 11:53:23]

Same argument as above.

[dvadym, 2017/06/09 11:59:25]

Acknowledged

+               return base::StartsWith(token, kAutocompleteCreditCardPrefix,
+                                       base::CompareCase::INSENSITIVE_ASCII);
+             }) != tokens.end();
 }
 
 bool IsCreditCardVerificationPasswordField(
     const blink::WebInputElement& field) {
   if (!field.IsPasswordField())
     return false;
 
   static const base::string16 kCardCvcReCached = base::UTF8ToUTF16(kCardCvcRe);
 
   return MatchesPattern(field.GetAttribute("id").Utf16(), kCardCvcReCached) ||
          MatchesPattern(field.GetAttribute("name").Utf16(), kCardCvcReCached);
 }
 
 std::string GetSignOnRealm(const GURL& origin) {
   GURL::Replacements rep;
   rep.SetPathStr("");
   return origin.ReplaceComponents(rep).spec();
 }
 
 }  // namespace autofill