Remove Finch kill switch for PSL matching

chrome/browser/password_manager/native_backend_gnome_x.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.
 
 #include "chrome/browser/password_manager/native_backend_gnome_x.h"
 
 #include <dlfcn.h>
 #include <gnome-keyring.h>
 
 #include <map>
@@ skipping 12 matching lines @@
 #include "base/synchronization/waitable_event.h"
 #include "base/time/time.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/core/browser/psl_matching_helper.h"
 #include "content/public/browser/browser_thread.h"
 
 using autofill::PasswordForm;
 using base::UTF8ToUTF16;
 using base::UTF16ToUTF8;
 using content::BrowserThread;
-using password_manager::PSLMatchingHelper;
 
 #define GNOME_KEYRING_DEFINE_POINTER(name) \
   typeof(&::gnome_keyring_##name) GnomeKeyringLoader::gnome_keyring_##name;
 GNOME_KEYRING_FOR_EACH_FUNC(GNOME_KEYRING_DEFINE_POINTER)
 #undef GNOME_KEYRING_DEFINE_POINTER
 
 bool GnomeKeyringLoader::keyring_loaded = false;
 
 #if defined(DLOPEN_GNOME_KEYRING)
 
@@ skipping 100 matching lines @@
   form->avatar_url = GURL(string_attr_map["avatar_url"]);
   form->federation_url = GURL(string_attr_map["federation_url"]);
   form->is_zero_click = uint_attr_map["is_zero_click"];
 
   return form.Pass();
 }
 
 // Parse all the results from the given GList into a PasswordFormList, and free
 // the GList. PasswordForms are allocated on the heap, and should be deleted by
 // the consumer. If not NULL, |lookup_form| is used to filter out results --
-// only credentials with signon realms passing the PSL matching (done by
-// |helper|) against |lookup_form->signon_realm| will be kept. PSL matched
-// results get their signon_realm, origin, and action rewritten to those of
-// |lookup_form_|, with the original signon_realm saved into the result's
-// original_signon_realm data member.
+// only credentials with signon realms passing the PSL matching against
+// |lookup_form->signon_realm| will be kept. PSL matched results get their
+// signon_realm, origin, and action rewritten to those of |lookup_form_|, with
+// the original signon_realm saved into the result's original_signon_realm data
+// member.
 void ConvertFormList(GList* found,
                      const PasswordForm* lookup_form,
-                     const PSLMatchingHelper& helper,
                      NativeBackendGnome::PasswordFormList* forms) {
-  PSLMatchingHelper::PSLDomainMatchMetric psl_domain_match_metric =
-      PSLMatchingHelper::PSL_DOMAIN_MATCH_NONE;
+  password_manager::PSLDomainMatchMetric psl_domain_match_metric =
+      password_manager::PSL_DOMAIN_MATCH_NONE;
   for (GList* element = g_list_first(found); element != NULL;
        element = g_list_next(element)) {
     GnomeKeyringFound* data = static_cast<GnomeKeyringFound*>(element->data);
     GnomeKeyringAttributeList* attrs = data->attributes;
 
     scoped_ptr<PasswordForm> form(FormFromAttributes(attrs));
     if (form) {
       if (lookup_form && form->signon_realm != lookup_form->signon_realm) {
         // This is not an exact match, we try PSL matching.
         if (lookup_form->scheme != PasswordForm::SCHEME_HTML ||
             form->scheme != PasswordForm::SCHEME_HTML ||
-            !(PSLMatchingHelper::IsPublicSuffixDomainMatch(
+            !(password_manager::IsPublicSuffixDomainMatch(
                 lookup_form->signon_realm, form->signon_realm))) {
           continue;
         }
-        psl_domain_match_metric = PSLMatchingHelper::PSL_DOMAIN_MATCH_FOUND;
+        psl_domain_match_metric = password_manager::PSL_DOMAIN_MATCH_FOUND;
         form->original_signon_realm = form->signon_realm;
         form->signon_realm = lookup_form->signon_realm;
         form->origin = lookup_form->origin;
         form->action = lookup_form->action;
       }
       if (data->secret) {
         form->password_value = UTF8ToUTF16(data->secret);
       } else {
         LOG(WARNING) << "Unable to access password from list element!";
       }
       forms->push_back(form.release());
     } else {
       LOG(WARNING) << "Could not initialize PasswordForm from attributes!";
     }
   }
   if (lookup_form) {
+    const GURL signon_realm(lookup_form->signon_realm);
+    std::string registered_domain =
+        password_manager::GetRegistryControlledDomain(signon_realm);
     UMA_HISTOGRAM_ENUMERATION(
         "PasswordManager.PslDomainMatchTriggering",
-        helper.IsMatchingEnabled()
+        password_manager::ShouldPSLDomainMatchingApply(registered_domain)
             ? psl_domain_match_metric
-            : PSLMatchingHelper::PSL_DOMAIN_MATCH_DISABLED,
-        PSLMatchingHelper::PSL_DOMAIN_MATCH_COUNT);
+            : password_manager::PSL_DOMAIN_MATCH_NOT_USED,
+        password_manager::PSL_DOMAIN_MATCH_COUNT);
   }
 }
 
 // Schema is analagous to the fields in PasswordForm.
 // TODO(gcasto): Adding 'form_data' would be nice, but we would need to
 // serialize in a way that is guaranteed to not have any embedded NULLs. Pickle
 // doesn't make this guarantee, so we just don't serialize this field. Since
 // it's only used to crowd source data collection it doesn't matter that much
 // if it's not available on this platform.
 const GnomeKeyringPasswordSchema kGnomeSchema = {
@@ skipping 94 matching lines @@
   GnomeKeyringResult result_;
   NativeBackendGnome::PasswordFormList forms_;
   // If the credential search is specified by a single form and needs to use PSL
   // matching, then the specifying form is stored in |lookup_form_|. If PSL
   // matching is used to find a result, then the results signon realm, origin
   // and action are stored are replaced by those of |lookup_form_|.
   // Additionally, |lookup_form_->signon_realm| is also used to narrow down the
   // found logins to those which indeed PSL-match the look-up. And finally,
   // |lookup_form_| set to NULL means that PSL matching is not required.
   scoped_ptr<PasswordForm> lookup_form_;
-  const PSLMatchingHelper helper_;
 };
 
 void GKRMethod::AddLogin(const PasswordForm& form, const char* app_string) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   time_t date_created = form.date_created.ToTimeT();
   // If we are asked to save a password with 0 date, use the current time.
   // We don't want to actually save passwords as though on January 1, 1970.
   if (!date_created)
     date_created = time(NULL);
   int64 date_synced = form.date_synced.ToInternalValue();
@@ skipping 83 matching lines @@
       "signon_realm", form.signon_realm.c_str(),
       "application", app_string,
       NULL);
 }
 
 void GKRMethod::GetLogins(const PasswordForm& form, const char* app_string) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   lookup_form_.reset(new PasswordForm(form));
   // Search GNOME Keyring for matching passwords.
   ScopedAttributeList attrs(gnome_keyring_attribute_list_new());
-  if (!helper_.ShouldPSLDomainMatchingApply(
-           PSLMatchingHelper::GetRegistryControlledDomain(
-               GURL(form.signon_realm)))) {
+  if (!password_manager::ShouldPSLDomainMatchingApply(
+          password_manager::GetRegistryControlledDomain(
+              GURL(form.signon_realm)))) {
     AppendString(&attrs, "signon_realm", form.signon_realm);
   }
   AppendString(&attrs, "application", app_string);
   gnome_keyring_find_items(GNOME_KEYRING_ITEM_GENERIC_SECRET,
                            attrs.get(),
                            OnOperationGetList,
                            /*data=*/this,
                            /*destroy_data=*/NULL);
 }
 
@@ skipping 74 matching lines @@
   method->event_.Signal();
 }
 
 // static
 void GKRMethod::OnOperationGetList(GnomeKeyringResult result, GList* list,
                                    gpointer data) {
   GKRMethod* method = static_cast<GKRMethod*>(data);
   method->result_ = result;
   method->forms_.clear();
   // |list| will be freed after this callback returns, so convert it now.
-  ConvertFormList(
-      list, method->lookup_form_.get(), method->helper_, &method->forms_);
+  ConvertFormList(list, method->lookup_form_.get(), &method->forms_);
   method->lookup_form_.reset(NULL);
   method->event_.Signal();
 }
 
 }  // namespace
 
 NativeBackendGnome::NativeBackendGnome(LocalProfileId id)
     : profile_id_(id) {
   app_string_ = GetProfileSpecificAppString();
 }
@@ skipping 256 matching lines @@
   }
   return ok;
 }
 
 std::string NativeBackendGnome::GetProfileSpecificAppString() const {
   // Originally, the application string was always just "chrome" and used only
   // so that we had *something* to search for since GNOME Keyring won't search
   // for nothing. Now we use it to distinguish passwords for different profiles.
   return base::StringPrintf("%s-%d", kGnomeKeyringAppString, profile_id_);
 }