Upstream version 5.34.98.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / password_manager / login_database.h

diff --git a/src/chrome/browser/password_manager/login_database.h b/src/chrome/browser/password_manager/login_database.h
index 792d6c3..d7bd738 100644 (file)
--- a/src/chrome/browser/password_manager/login_database.h
+++ b/src/chrome/browser/password_manager/login_database.h
@@ -11,10 +11,14 @@
 #include "base/files/file_path.h"
 #include "base/pickle.h"
 #include "base/strings/string16.h"
-#include "components/autofill/core/common/password_form.h"
+#include "chrome/browser/password_manager/psl_matching_helper.h"
 #include "sql/connection.h"
 #include "sql/meta_table.h"
 
+namespace autofill {
+struct PasswordForm;
+}  // namespace autofill
+
 // Interface to the database storage of login information, intended as a helper
 // for PasswordStore on platforms that need internal storage of some or all of
 // the login information.
@@ -97,7 +101,7 @@ class LoginDatabase {
   // successful, or returning false and leaving cipher_text unchanged if
   // encryption fails (e.g., if the underlying OS encryption system is
   // temporarily unavailable).
-  EncryptionResult EncryptedString(const string16& plain_text,
+  EncryptionResult EncryptedString(const base::string16& plain_text,
                                    std::string* cipher_text) const;
 
   // Decrypts cipher_text, setting the value of plain_text and returning true if
@@ -105,7 +109,7 @@ class LoginDatabase {
   // decryption fails (e.g., if the underlying OS encryption system is
   // temporarily unavailable).
   EncryptionResult DecryptedString(const std::string& cipher_text,
-                                   string16* plain_text) const;
+                                   base::string16* plain_text) const;
 
   bool InitLoginsTable();
   bool MigrateOldVersionsAsNeeded();
@@ -123,15 +127,14 @@ class LoginDatabase {
       bool blacklisted, std::vector<autofill::PasswordForm*>* forms) const;
 
   // Serialization routines for vectors.
-  Pickle SerializeVector(const std::vector<string16>& vec) const;
-  std::vector<string16> DeserializeVector(const Pickle& pickle) const;
+  Pickle SerializeVector(const std::vector<base::string16>& vec) const;
+  std::vector<base::string16> DeserializeVector(const Pickle& pickle) const;
 
   base::FilePath db_path_;
   mutable sql::Connection db_;
   sql::MetaTable meta_table_;
 
-  // Set to true if the public suffix based domain matching is enabled.
-  bool public_suffix_domain_matching_;
+  PSLMatchingHelper psl_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginDatabase);
 };