Minor fixes in login_database.* and sql/statement.*

components/password_manager/core/browser/login_database.cc

Index: components/password_manager/core/browser/login_database.cc
diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc
index d4e913cd7685f159ad0be44805ebfe05b9d6e9e5..0e79eb407ea12948211fe323ffc1b7e8ef8b2a64 100644
--- a/components/password_manager/core/browser/login_database.cc
+++ b/components/password_manager/core/browser/login_database.cc
@@ -8,6 +8,7 @@
 #include <stdint.h>
 #include <algorithm>
 #include <limits>
+#include <map>
 #include <utility>
 
 #include "base/bind.h"
@@ -1057,7 +1058,7 @@ bool LoginDatabase::DisableAutoSignInForAllLogins() {
 // static
 LoginDatabase::EncryptionResult LoginDatabase::InitPasswordFormFromStatement(
     PasswordForm* form,
-    sql::Statement& s) {
+    const sql::Statement& s) {
   std::string encrypted_password;
   s.ColumnBlobAsString(COLUMN_PASSWORD_VALUE, &encrypted_password);
   base::string16 decrypted_password;