From 9c4bf23a4cde497b8bad3f89b60457841470618c Mon Sep 17 00:00:00 2001 From: "isherman@chromium.org" Date: Thu, 15 Dec 2011 02:25:08 +0000 Subject: Group forms-related files in webkit/glue in a forms/ subdirectory. BUG=none TEST=compiles Review URL: http://codereview.chromium.org/8680040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114581 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/importer/nss_decryptor.cc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'chrome/browser/importer/nss_decryptor.cc') diff --git a/chrome/browser/importer/nss_decryptor.cc b/chrome/browser/importer/nss_decryptor.cc index d837c20..1658e35 100644 --- a/chrome/browser/importer/nss_decryptor.cc +++ b/chrome/browser/importer/nss_decryptor.cc @@ -14,7 +14,7 @@ #include "base/utf_string_conversions.h" #include "sql/connection.h" #include "sql/statement.h" -#include "webkit/glue/password_form.h" +#include "webkit/forms/password_form.h" #if defined(USE_NSS) #include @@ -110,8 +110,9 @@ string16 NSSDecryptor::Decrypt(const std::string& crypt) const { // http://kb.mozillazine.org/Signons.txt // http://kb.mozillazine.org/Signons2.txt // http://kb.mozillazine.org/Signons3.txt -void NSSDecryptor::ParseSignons(const std::string& content, - std::vector* forms) { +void NSSDecryptor::ParseSignons( + const std::string& content, + std::vector* forms) { forms->clear(); // Splits the file content into lines. @@ -140,7 +141,7 @@ void NSSDecryptor::ParseSignons(const std::string& content, // Reads never-saved list. Domains are stored one per line. size_t i; for (i = 1; i < lines.size() && lines[i].compare(".") != 0; ++i) { - webkit_glue::PasswordForm form; + webkit::forms::PasswordForm form; form.origin = GURL(lines[i]).ReplaceComponents(rep); form.signon_realm = form.origin.GetOrigin().spec(); form.blacklisted_by_user = true; @@ -162,7 +163,7 @@ void NSSDecryptor::ParseSignons(const std::string& content, if (end - begin < 5) continue; - webkit_glue::PasswordForm form; + webkit::forms::PasswordForm form; // The first line is the site URL. // For HTTP authentication logins, the URL may contain http realm, @@ -232,7 +233,7 @@ void NSSDecryptor::ParseSignons(const std::string& content, } bool NSSDecryptor::ReadAndParseSignons(const FilePath& sqlite_file, - std::vector* forms) { + std::vector* forms) { sql::Connection db; if (!db.Open(sqlite_file)) return false; @@ -249,7 +250,7 @@ bool NSSDecryptor::ReadAndParseSignons(const FilePath& sqlite_file, rep.ClearPassword(); // Read domains for which passwords are never saved. while (s.Step()) { - webkit_glue::PasswordForm form; + webkit::forms::PasswordForm form; form.origin = GURL(s.ColumnString(0)).ReplaceComponents(rep); form.signon_realm = form.origin.GetOrigin().spec(); form.blacklisted_by_user = true; @@ -280,7 +281,7 @@ bool NSSDecryptor::ReadAndParseSignons(const FilePath& sqlite_file, if (!url.is_valid()) continue; - webkit_glue::PasswordForm form; + webkit::forms::PasswordForm form; form.origin = url.ReplaceComponents(rep); form.signon_realm = form.origin.GetOrigin().spec(); if (!realm.empty()) -- cgit v1.1