Require explicit selection of traits for LazyInstance

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 87 matching lines @@
   re2::RE2::Options options;
   options.set_case_sensitive(false);
   // Use placement new to initialize the instance in the preallocated space.
   // The "(instance)" is very important to force POD type initialization.
   re2::RE2* matcher = new (instance) re2::RE2(pattern, options);
   DCHECK(matcher->ok());
   return matcher;
 }
 
 struct LoginAndSignupLazyInstanceTraits
-    : public base::DefaultLazyInstanceTraits<re2::RE2> {
+    : public base::internal::DestructorAtExitLazyInstanceTraits<re2::RE2> {
   static re2::RE2* New(void* instance) {
     return CreateMatcher(instance, kLoginAndSignupRegex);
   }
 };
 
 base::LazyInstance<re2::RE2, LoginAndSignupLazyInstanceTraits>
     g_login_and_signup_matcher = LAZY_INSTANCE_INITIALIZER;
 
 // Given the sequence of non-password and password text input fields of a form,
 // represented as a string of Ns (non-password) and Ps (password), computes the
@@ skipping 182 matching lines @@
     }
   }
 }
 
 // TODO(crbug.com/543085): Move the reauthentication recognition code to the
 // browser.
 const char kPasswordSiteUrlRegex[] =
     "passwords(?:-[a-z-]+\\.corp)?\\.google\\.com";
 
 struct PasswordSiteUrlLazyInstanceTraits
-    : public base::DefaultLazyInstanceTraits<re2::RE2> {
+    : public base::internal::DestructorAtExitLazyInstanceTraits<re2::RE2> {
   static re2::RE2* New(void* instance) {
     return CreateMatcher(instance, kPasswordSiteUrlRegex);
   }
 };
 
 base::LazyInstance<re2::RE2, PasswordSiteUrlLazyInstanceTraits>
     g_password_site_matcher = LAZY_INSTANCE_INITIALIZER;
 
 // Returns the |input_field| name if its non-empty; otherwise a |dummy_name|.
 base::string16 FieldName(const WebInputElement& input_field,
@@ skipping 404 matching lines @@
                                    const char* value_in_lowercase) {
   base::string16 autocomplete_attribute(
       element.getAttribute("autocomplete").utf16());
   std::vector<std::string> tokens = LowercaseAndTokenizeAttributeString(
       base::UTF16ToUTF8(autocomplete_attribute));
 
   return base::ContainsValue(tokens, value_in_lowercase);
 }
 
 }  // namespace autofill