[Password Manager] Remove PSL matching for non-HTML forms

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 147 matching lines @@
   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 (!(PSLMatchingHelper::IsPublicSuffixDomainMatch(
-                lookup_form->signon_realm, form->signon_realm))) {
+                lookup_form->signon_realm, form->signon_realm)) ||
+            lookup_form->scheme != PasswordForm::SCHEME_HTML ||

[vabr (Chromium), 2014/05/07 07:57:38]

optional nit: the added tests are cheaper than the IsPublicSuffixDomainMatch, so
I suggest putting them before the IsPublicSuffixDomainMatch -- if they return
true, it will spare some work.

Then again, this is probably not a performance hotspot, that's why the nit is
optional.

[Garrett Casto, 2014/05/08 20:01:20]

Done.

+            form->scheme != PasswordForm::SCHEME_HTML) {
           continue;
         }
         psl_domain_match_metric = PSLMatchingHelper::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);
@@ skipping 557 matching lines @@
   }
   return true;
 }
 
 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_);
 }