NSSDecryptor::ReadAndParseSignons() - improved password form scheme detection,

chrome/utility/importer/nss_decryptor.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/utility/importer/nss_decryptor.h"
 
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 266 matching lines @@
     } else {
       url = GURL(s2.ColumnString(0));
     }
     // Skip this row if the URL is not valid.
     if (!url.is_valid())
       continue;
 
     autofill::PasswordForm form;
     form.origin = url.ReplaceComponents(rep);
     form.signon_realm = form.origin.GetOrigin().spec();
-    if (!realm.empty())
+    if (!realm.empty()) {
       form.signon_realm += realm;
+      // Non-empty realm indicates that it's not html form authentication entry.
+      // Extracted data doesn't allow us to distinguish basic_auth entry from
+      // digest_auth entry, so let's assume basic_auth.
+      form.scheme = autofill::PasswordForm::SCHEME_BASIC;
+    }
     form.ssl_valid = form.origin.SchemeIsSecure();
     // The user name, password and action.
     form.username_element = s2.ColumnString16(3);
     form.username_value = Decrypt(s2.ColumnString(5));
     form.password_element = s2.ColumnString16(4);
     form.password_value = Decrypt(s2.ColumnString(6));
     form.action = GURL(s2.ColumnString(2)).ReplaceComponents(rep);
     forms->push_back(form);
   }
   return true;
 }