summaryrefslogtreecommitdiffstats
path: root/chrome/browser/password_manager
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/password_manager')
-rw-r--r--chrome/browser/password_manager/account_chooser_dialog_android.cc1
-rw-r--r--chrome/browser/password_manager/account_chooser_dialog_android.h3
-rw-r--r--chrome/browser/password_manager/auto_signin_infobar_delegate_unittest.cc1
-rw-r--r--chrome/browser/password_manager/chrome_password_manager_client.cc1
-rw-r--r--chrome/browser/password_manager/chrome_password_manager_client.h2
-rw-r--r--chrome/browser/password_manager/chrome_password_manager_client_unittest.cc5
-rw-r--r--chrome/browser/password_manager/credential_android.h2
-rw-r--r--chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.cc2
-rw-r--r--chrome/browser/password_manager/native_backend_gnome_x.cc11
-rw-r--r--chrome/browser/password_manager/native_backend_gnome_x.h2
-rw-r--r--chrome/browser/password_manager/native_backend_gnome_x_unittest.cc3
-rw-r--r--chrome/browser/password_manager/native_backend_kwallet_x.cc7
-rw-r--r--chrome/browser/password_manager/native_backend_kwallet_x.h2
-rw-r--r--chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc3
-rw-r--r--chrome/browser/password_manager/native_backend_libsecret.cc16
-rw-r--r--chrome/browser/password_manager/native_backend_libsecret.h2
-rw-r--r--chrome/browser/password_manager/native_backend_libsecret_unittest.cc3
-rw-r--r--chrome/browser/password_manager/password_manager_browsertest.cc2
-rw-r--r--chrome/browser/password_manager/password_manager_infobar_delegate.h1
-rw-r--r--chrome/browser/password_manager/password_manager_test_base.cc1
-rw-r--r--chrome/browser/password_manager/password_manager_test_base.h1
-rw-r--r--chrome/browser/password_manager/password_manager_util_mac.mm2
-rw-r--r--chrome/browser/password_manager/password_manager_util_win.cc8
-rw-r--r--chrome/browser/password_manager/password_store_factory.cc1
-rw-r--r--chrome/browser/password_manager/password_store_factory.h3
-rw-r--r--chrome/browser/password_manager/password_store_mac.cc4
-rw-r--r--chrome/browser/password_manager/password_store_mac.h1
-rw-r--r--chrome/browser/password_manager/password_store_mac_internal.h1
-rw-r--r--chrome/browser/password_manager/password_store_mac_unittest.cc4
-rw-r--r--chrome/browser/password_manager/password_store_proxy_mac.h1
-rw-r--r--chrome/browser/password_manager/password_store_proxy_mac_unittest.cc1
-rw-r--r--chrome/browser/password_manager/password_store_win.cc3
-rw-r--r--chrome/browser/password_manager/password_store_win.h1
-rw-r--r--chrome/browser/password_manager/password_store_win_unittest.cc1
-rw-r--r--chrome/browser/password_manager/password_store_x.h3
-rw-r--r--chrome/browser/password_manager/password_store_x_unittest.cc3
-rw-r--r--chrome/browser/password_manager/save_password_infobar_delegate.h2
-rw-r--r--chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc1
-rw-r--r--chrome/browser/password_manager/simple_password_store_mac.h1
39 files changed, 81 insertions, 31 deletions
diff --git a/chrome/browser/password_manager/account_chooser_dialog_android.cc b/chrome/browser/password_manager/account_chooser_dialog_android.cc
index 4321e97..6b75669 100644
--- a/chrome/browser/password_manager/account_chooser_dialog_android.cc
+++ b/chrome/browser/password_manager/account_chooser_dialog_android.cc
@@ -7,6 +7,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
#include "chrome/browser/password_manager/chrome_password_manager_client.h"
#include "chrome/browser/password_manager/credential_android.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/password_manager/account_chooser_dialog_android.h b/chrome/browser/password_manager/account_chooser_dialog_android.h
index ed193ca..4b7d540 100644
--- a/chrome/browser/password_manager/account_chooser_dialog_android.h
+++ b/chrome/browser/password_manager/account_chooser_dialog_android.h
@@ -5,9 +5,12 @@
#ifndef CHROME_BROWSER_PASSWORD_MANAGER_ACCOUNT_CHOOSER_DIALOG_ANDROID_H_
#define CHROME_BROWSER_PASSWORD_MANAGER_ACCOUNT_CHOOSER_DIALOG_ANDROID_H_
+#include <stddef.h>
+
#include <vector>
#include "base/android/jni_android.h"
+#include "base/macros.h"
#include "base/memory/scoped_vector.h"
#include "chrome/browser/ui/passwords/manage_passwords_state.h"
diff --git a/chrome/browser/password_manager/auto_signin_infobar_delegate_unittest.cc b/chrome/browser/password_manager/auto_signin_infobar_delegate_unittest.cc
index 911c4aa..908aaa4 100644
--- a/chrome/browser/password_manager/auto_signin_infobar_delegate_unittest.cc
+++ b/chrome/browser/password_manager/auto_signin_infobar_delegate_unittest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/macros.h"
#include "base/prefs/pref_service.h"
#include "chrome/browser/password_manager/auto_signin_first_run_infobar_delegate.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
index 9a795e9..d25440f 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -13,6 +13,7 @@
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram.h"
#include "base/prefs/pref_service.h"
+#include "build/build_config.h"
#include "chrome/browser/browsing_data/browsing_data_helper.h"
#include "chrome/browser/password_manager/password_store_factory.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.h b/chrome/browser/password_manager/chrome_password_manager_client.h
index 1bbe064..c9150e2 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.h
+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
@@ -5,8 +5,8 @@
#ifndef CHROME_BROWSER_PASSWORD_MANAGER_CHROME_PASSWORD_MANAGER_CLIENT_H_
#define CHROME_BROWSER_PASSWORD_MANAGER_CHROME_PASSWORD_MANAGER_CLIENT_H_
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/prefs/pref_member.h"
diff --git a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
index c4c53e5..000060f 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
@@ -4,9 +4,12 @@
#include "chrome/browser/password_manager/chrome_password_manager_client.h"
+#include <stdint.h>
+
#include <string>
#include "base/command_line.h"
+#include "base/macros.h"
#include "base/metrics/field_trial.h"
#include "base/prefs/pref_registry_simple.h"
#include "base/prefs/pref_service.h"
@@ -122,7 +125,7 @@ ChromePasswordManagerClient* ChromePasswordManagerClientTest::GetClient() {
bool ChromePasswordManagerClientTest::WasLoggingActivationMessageSent(
bool* activation_flag) {
- const uint32 kMsgID = AutofillMsg_SetLoggingState::ID;
+ const uint32_t kMsgID = AutofillMsg_SetLoggingState::ID;
const IPC::Message* message =
process()->sink().GetFirstMessageMatching(kMsgID);
if (!message)
diff --git a/chrome/browser/password_manager/credential_android.h b/chrome/browser/password_manager/credential_android.h
index 6f450e183..004abc3f 100644
--- a/chrome/browser/password_manager/credential_android.h
+++ b/chrome/browser/password_manager/credential_android.h
@@ -5,6 +5,8 @@
#ifndef CHROME_BROWSER_PASSWORD_MANAGER_CREDENTIAL_ANDROID_H_
#define CHROME_BROWSER_PASSWORD_MANAGER_CREDENTIAL_ANDROID_H_
+#include <stddef.h>
+
#include "base/android/jni_array.h"
#include "base/android/scoped_java_ref.h"
#include "components/autofill/core/common/password_form.h"
diff --git a/chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.cc b/chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.cc
index 4a2a8c1..fdae9fd 100644
--- a/chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.cc
+++ b/chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.h"
-#include <cstddef>
+#include <stddef.h>
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/android/chrome_application.h"
diff --git a/chrome/browser/password_manager/native_backend_gnome_x.cc b/chrome/browser/password_manager/native_backend_gnome_x.cc
index 7e3fbcf..0a225a3 100644
--- a/chrome/browser/password_manager/native_backend_gnome_x.cc
+++ b/chrome/browser/password_manager/native_backend_gnome_x.cc
@@ -6,12 +6,13 @@
#include <dlfcn.h>
#include <gnome-keyring.h>
+#include <stddef.h>
+#include <stdint.h>
#include <map>
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/metrics/histogram.h"
@@ -134,7 +135,7 @@ scoped_ptr<PasswordForm> FormFromAttributes(GnomeKeyringAttributeList* attrs) {
form->signon_realm = string_attr_map["signon_realm"];
form->ssl_valid = uint_attr_map["ssl_valid"];
form->preferred = uint_attr_map["preferred"];
- int64 date_created = 0;
+ int64_t date_created = 0;
bool date_ok = base::StringToInt64(string_attr_map["date_created"],
&date_created);
DCHECK(date_ok);
@@ -151,7 +152,7 @@ scoped_ptr<PasswordForm> FormFromAttributes(GnomeKeyringAttributeList* attrs) {
form->type = static_cast<PasswordForm::Type>(uint_attr_map["type"]);
form->times_used = uint_attr_map["times_used"];
form->scheme = static_cast<PasswordForm::Scheme>(uint_attr_map["scheme"]);
- int64 date_synced = 0;
+ int64_t date_synced = 0;
base::StringToInt64(string_attr_map["date_synced"], &date_synced);
form->date_synced = base::Time::FromInternalValue(date_synced);
form->display_name = UTF8ToUTF16(string_attr_map["display_name"]);
@@ -335,12 +336,12 @@ class GKRMethod : public GnomeKeyringLoader {
void GKRMethod::AddLogin(const PasswordForm& form, const char* app_string) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- int64 date_created = form.date_created.ToInternalValue();
+ int64_t date_created = form.date_created.ToInternalValue();
// If we are asked to save a password with 0 date, use the current time.
// We don't want to actually save passwords as though on January 1, 1601.
if (!date_created)
date_created = base::Time::Now().ToInternalValue();
- int64 date_synced = form.date_synced.ToInternalValue();
+ int64_t date_synced = form.date_synced.ToInternalValue();
std::string form_data;
SerializeFormDataToBase64String(form.form_data, &form_data);
gnome_keyring_store_password(
diff --git a/chrome/browser/password_manager/native_backend_gnome_x.h b/chrome/browser/password_manager/native_backend_gnome_x.h
index d7ae092..6042c99 100644
--- a/chrome/browser/password_manager/native_backend_gnome_x.h
+++ b/chrome/browser/password_manager/native_backend_gnome_x.h
@@ -19,8 +19,8 @@
#include <string>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/scoped_vector.h"
#include "base/time/time.h"
#include "chrome/browser/password_manager/password_store_factory.h"
diff --git a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc
index c387919..c387724c 100644
--- a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc
+++ b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc
@@ -3,8 +3,9 @@
// found in the LICENSE file.
#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
-#include "base/basictypes.h"
#include "base/location.h"
#include "base/prefs/pref_service.h"
#include "base/single_thread_task_runner.h"
diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.cc b/chrome/browser/password_manager/native_backend_kwallet_x.cc
index 37c18cb..5c7db54 100644
--- a/chrome/browser/password_manager/native_backend_kwallet_x.cc
+++ b/chrome/browser/password_manager/native_backend_kwallet_x.cc
@@ -4,6 +4,9 @@
#include "chrome/browser/password_manager/native_backend_kwallet_x.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include <vector>
#include "base/bind.h"
@@ -148,7 +151,7 @@ bool DeserializeValueSize(const std::string& signon_realm,
form->signon_realm.assign(signon_realm);
int scheme = 0;
- int64 date_created = 0;
+ int64_t date_created = 0;
int type = 0;
int generation_upload_status = 0;
// Note that these will be read back in the order listed due to
@@ -181,7 +184,7 @@ bool DeserializeValueSize(const std::string& signon_realm,
}
if (version > 2) {
- int64 date_synced = 0;
+ int64_t date_synced = 0;
if (!iter.ReadInt64(&date_synced)) {
LogDeserializationWarning(version, signon_realm, false);
return false;
diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.h b/chrome/browser/password_manager/native_backend_kwallet_x.h
index bb634668..e2d6ece 100644
--- a/chrome/browser/password_manager/native_backend_kwallet_x.h
+++ b/chrome/browser/password_manager/native_backend_kwallet_x.h
@@ -7,8 +7,8 @@
#include <string>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_vector.h"
#include "base/nix/xdg_util.h"
diff --git a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc
index 9f23b0d..d6394b3 100644
--- a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc
+++ b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc
@@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+#include <stdint.h>
+
#include <algorithm>
#include <map>
#include <set>
diff --git a/chrome/browser/password_manager/native_backend_libsecret.cc b/chrome/browser/password_manager/native_backend_libsecret.cc
index a0d81ef..5ad849b 100644
--- a/chrome/browser/password_manager/native_backend_libsecret.cc
+++ b/chrome/browser/password_manager/native_backend_libsecret.cc
@@ -5,9 +5,10 @@
#include "chrome/browser/password_manager/native_backend_libsecret.h"
#include <dlfcn.h>
+#include <stddef.h>
+#include <stdint.h>
#include <list>
-#include "base/basictypes.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/metrics/histogram.h"
@@ -160,7 +161,7 @@ scoped_ptr<PasswordForm> FormOutOfAttributes(GHashTable* attrs) {
form->signon_realm = GetStringFromAttributes(attrs, "signon_realm");
form->ssl_valid = GetUintFromAttributes(attrs, "ssl_valid");
form->preferred = GetUintFromAttributes(attrs, "preferred");
- int64 date_created = 0;
+ int64_t date_created = 0;
bool date_ok = base::StringToInt64(
GetStringFromAttributes(attrs, "date_created"), &date_created);
DCHECK(date_ok);
@@ -180,7 +181,7 @@ scoped_ptr<PasswordForm> FormOutOfAttributes(GHashTable* attrs) {
form->times_used = GetUintFromAttributes(attrs, "times_used");
form->scheme =
static_cast<PasswordForm::Scheme>(GetUintFromAttributes(attrs, "scheme"));
- int64 date_synced = 0;
+ int64_t date_synced = 0;
base::StringToInt64(GetStringFromAttributes(attrs, "date_synced"),
&date_synced);
form->date_synced = base::Time::FromInternalValue(date_synced);
@@ -210,7 +211,7 @@ class LibsecretAttributesBuilder {
LibsecretAttributesBuilder();
~LibsecretAttributesBuilder();
void Append(const std::string& name, const std::string& value);
- void Append(const std::string& name, int64 value);
+ void Append(const std::string& name, int64_t value);
// GHashTable, its keys and values returned from Get() are destroyed in
// |LibsecretAttributesBuilder| desctructor.
GHashTable* Get() { return attrs_; }
@@ -242,7 +243,8 @@ void LibsecretAttributesBuilder::Append(const std::string& name,
g_hash_table_insert(attrs_, name_str, value_str);
}
-void LibsecretAttributesBuilder::Append(const std::string& name, int64 value) {
+void LibsecretAttributesBuilder::Append(const std::string& name,
+ int64_t value) {
Append(name, base::Int64ToString(value));
}
@@ -433,12 +435,12 @@ bool NativeBackendLibsecret::AddUpdateLoginSearch(
}
bool NativeBackendLibsecret::RawAddLogin(const PasswordForm& form) {
- int64 date_created = form.date_created.ToInternalValue();
+ int64_t date_created = form.date_created.ToInternalValue();
// If we are asked to save a password with 0 date, use the current time.
// We don't want to actually save passwords as though on January 1, 1601.
if (!date_created)
date_created = base::Time::Now().ToInternalValue();
- int64 date_synced = form.date_synced.ToInternalValue();
+ int64_t date_synced = form.date_synced.ToInternalValue();
std::string form_data;
SerializeFormDataToBase64String(form.form_data, &form_data);
GError* error = nullptr;
diff --git a/chrome/browser/password_manager/native_backend_libsecret.h b/chrome/browser/password_manager/native_backend_libsecret.h
index 3acc55f..9e21ef8 100644
--- a/chrome/browser/password_manager/native_backend_libsecret.h
+++ b/chrome/browser/password_manager/native_backend_libsecret.h
@@ -9,8 +9,8 @@
#include <string>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/scoped_vector.h"
#include "base/time/time.h"
#include "chrome/browser/password_manager/password_store_factory.h"
diff --git a/chrome/browser/password_manager/native_backend_libsecret_unittest.cc b/chrome/browser/password_manager/native_backend_libsecret_unittest.cc
index c68673e..a710b4f 100644
--- a/chrome/browser/password_manager/native_backend_libsecret_unittest.cc
+++ b/chrome/browser/password_manager/native_backend_libsecret_unittest.cc
@@ -3,8 +3,9 @@
// found in the LICENSE file.
#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
-#include "base/basictypes.h"
#include "base/location.h"
#include "base/prefs/pref_service.h"
#include "base/single_thread_task_runner.h"
diff --git a/chrome/browser/password_manager/password_manager_browsertest.cc b/chrome/browser/password_manager/password_manager_browsertest.cc
index b687d26..a099b21 100644
--- a/chrome/browser/password_manager/password_manager_browsertest.cc
+++ b/chrome/browser/password_manager/password_manager_browsertest.cc
@@ -5,6 +5,7 @@
#include <string>
#include "base/command_line.h"
+#include "base/macros.h"
#include "base/metrics/histogram_samples.h"
#include "base/metrics/statistics_recorder.h"
#include "base/path_service.h"
@@ -12,6 +13,7 @@
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/password_manager/chrome_password_manager_client.h"
#include "chrome/browser/password_manager/password_manager_test_base.h"
diff --git a/chrome/browser/password_manager/password_manager_infobar_delegate.h b/chrome/browser/password_manager/password_manager_infobar_delegate.h
index 9314db4..edcffe6 100644
--- a/chrome/browser/password_manager/password_manager_infobar_delegate.h
+++ b/chrome/browser/password_manager/password_manager_infobar_delegate.h
@@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_INFOBAR_DELEGATE_H_
#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_INFOBAR_DELEGATE_H_
+#include "base/macros.h"
#include "components/infobars/core/confirm_infobar_delegate.h"
#include "ui/gfx/range/range.h"
diff --git a/chrome/browser/password_manager/password_manager_test_base.cc b/chrome/browser/password_manager/password_manager_test_base.cc
index d7fe6bd..7661d4f 100644
--- a/chrome/browser/password_manager/password_manager_test_base.cc
+++ b/chrome/browser/password_manager/password_manager_test_base.cc
@@ -7,6 +7,7 @@
#include <string>
#include "base/command_line.h"
+#include "base/macros.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/infobars/infobar_service.h"
diff --git a/chrome/browser/password_manager/password_manager_test_base.h b/chrome/browser/password_manager/password_manager_test_base.h
index dc1763d..b8cf4d2 100644
--- a/chrome/browser/password_manager/password_manager_test_base.h
+++ b/chrome/browser/password_manager/password_manager_test_base.h
@@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_TEST_BASE_H_
#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_TEST_BASE_H_
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/password_manager/password_manager_util_mac.mm b/chrome/browser/password_manager/password_manager_util_mac.mm
index b1a2283..832228b 100644
--- a/chrome/browser/password_manager/password_manager_util_mac.mm
+++ b/chrome/browser/password_manager/password_manager_util_mac.mm
@@ -8,10 +8,10 @@
#import <Foundation/Foundation.h>
#include <Security/Authorization.h>
-#include "base/basictypes.h"
#include "base/mac/authorization_util.h"
#include "base/mac/foundation_util.h"
#include "base/mac/scoped_authorizationref.h"
+#include "base/macros.h"
#include "chrome/grit/chromium_strings.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/password_manager/password_manager_util_win.cc b/chrome/browser/password_manager/password_manager_util_win.cc
index cc5371f..d179760 100644
--- a/chrome/browser/password_manager/password_manager_util_win.cc
+++ b/chrome/browser/password_manager/password_manager_util_win.cc
@@ -5,6 +5,8 @@
// windows.h must be first otherwise Win8 SDK breaks.
#include <windows.h>
#include <LM.h>
+#include <stddef.h>
+#include <stdint.h>
#include <wincred.h>
// SECURITY_WIN32 must be defined in order to get
@@ -65,7 +67,7 @@ struct PasswordCheckPrefs {
void Read(PrefService* local_state);
void Write(PrefService* local_state);
- int64 pref_last_changed_;
+ int64_t pref_last_changed_;
bool blank_password_;
};
@@ -83,7 +85,7 @@ void PasswordCheckPrefs::Write(PrefService* local_state) {
pref_last_changed_);
}
-int64 GetPasswordLastChanged(const WCHAR* username) {
+int64_t GetPasswordLastChanged(const WCHAR* username) {
LPUSER_INFO_1 user_info = NULL;
DWORD age = 0;
@@ -104,7 +106,7 @@ int64 GetPasswordLastChanged(const WCHAR* username) {
bool CheckBlankPasswordWithPrefs(const WCHAR* username,
PasswordCheckPrefs* prefs) {
- int64 last_changed = GetPasswordLastChanged(username);
+ int64_t last_changed = GetPasswordLastChanged(username);
// If we cannot determine when the password was last changed
// then assume the password is not blank
diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc
index 2048d88..1830a22 100644
--- a/chrome/browser/password_manager/password_store_factory.cc
+++ b/chrome/browser/password_manager/password_store_factory.cc
@@ -11,6 +11,7 @@
#include "base/prefs/pref_service.h"
#include "base/rand_util.h"
#include "base/thread_task_runner_handle.h"
+#include "build/build_config.h"
#include "chrome/browser/profiles/incognito_helpers.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sync/glue/sync_start_util.h"
diff --git a/chrome/browser/password_manager/password_store_factory.h b/chrome/browser/password_manager/password_store_factory.h
index 07c0246..6c0df54 100644
--- a/chrome/browser/password_manager/password_store_factory.h
+++ b/chrome/browser/password_manager/password_store_factory.h
@@ -7,8 +7,9 @@
#include <string>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/singleton.h"
+#include "build/build_config.h"
#include "components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h"
#include "components/keyed_service/core/service_access_type.h"
diff --git a/chrome/browser/password_manager/password_store_mac.cc b/chrome/browser/password_manager/password_store_mac.cc
index 13f09dc..15fa9ec 100644
--- a/chrome/browser/password_manager/password_store_mac.cc
+++ b/chrome/browser/password_manager/password_store_mac.cc
@@ -3,9 +3,9 @@
// found in the LICENSE file.
#include "chrome/browser/password_manager/password_store_mac.h"
-#include "chrome/browser/password_manager/password_store_mac_internal.h"
#include <CoreServices/CoreServices.h>
+#include <stddef.h>
#include <set>
#include <string>
#include <utility>
@@ -15,12 +15,14 @@
#include "base/logging.h"
#include "base/mac/foundation_util.h"
#include "base/mac/mac_logging.h"
+#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/mac/security_wrappers.h"
+#include "chrome/browser/password_manager/password_store_mac_internal.h"
#include "components/os_crypt/os_crypt.h"
#include "components/password_manager/core/browser/affiliation_utils.h"
#include "components/password_manager/core/browser/login_database.h"
diff --git a/chrome/browser/password_manager/password_store_mac.h b/chrome/browser/password_manager/password_store_mac.h
index 11be407..32ea3df 100644
--- a/chrome/browser/password_manager/password_store_mac.h
+++ b/chrome/browser/password_manager/password_store_mac.h
@@ -9,6 +9,7 @@
#include <vector>
#include "base/callback_forward.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/threading/thread.h"
diff --git a/chrome/browser/password_manager/password_store_mac_internal.h b/chrome/browser/password_manager/password_store_mac_internal.h
index 47ec33c..52cbd00 100644
--- a/chrome/browser/password_manager/password_store_mac_internal.h
+++ b/chrome/browser/password_manager/password_store_mac_internal.h
@@ -10,6 +10,7 @@
#include <string>
#include <vector>
+#include "base/macros.h"
#include "base/memory/scoped_vector.h"
#include "components/autofill/core/common/password_form.h"
#include "crypto/apple_keychain.h"
diff --git a/chrome/browser/password_manager/password_store_mac_unittest.cc b/chrome/browser/password_manager/password_store_mac_unittest.cc
index 69b0c77..d841e35 100644
--- a/chrome/browser/password_manager/password_store_mac_unittest.cc
+++ b/chrome/browser/password_manager/password_store_mac_unittest.cc
@@ -4,10 +4,12 @@
#include "chrome/browser/password_manager/password_store_mac.h"
+#include <stddef.h>
+
#include <string>
-#include "base/basictypes.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
#include "base/scoped_observer.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
diff --git a/chrome/browser/password_manager/password_store_proxy_mac.h b/chrome/browser/password_manager/password_store_proxy_mac.h
index 5c21509..5abe0e00 100644
--- a/chrome/browser/password_manager/password_store_proxy_mac.h
+++ b/chrome/browser/password_manager/password_store_proxy_mac.h
@@ -8,6 +8,7 @@
#include <string>
#include <vector>
+#include "base/macros.h"
#include "base/prefs/pref_member.h"
#include "base/threading/thread.h"
#include "components/password_manager/core/browser/keychain_migration_status_mac.h"
diff --git a/chrome/browser/password_manager/password_store_proxy_mac_unittest.cc b/chrome/browser/password_manager/password_store_proxy_mac_unittest.cc
index 204c9c7..d4a0d56 100644
--- a/chrome/browser/password_manager/password_store_proxy_mac_unittest.cc
+++ b/chrome/browser/password_manager/password_store_proxy_mac_unittest.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/password_manager/password_store_proxy_mac.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
#include "base/scoped_observer.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/histogram_tester.h"
diff --git a/chrome/browser/password_manager/password_store_win.cc b/chrome/browser/password_manager/password_store_win.cc
index db9076f..aa4a6e9 100644
--- a/chrome/browser/password_manager/password_store_win.cc
+++ b/chrome/browser/password_manager/password_store_win.cc
@@ -4,11 +4,14 @@
#include "chrome/browser/password_manager/password_store_win.h"
+#include <stddef.h>
+
#include <map>
#include <vector>
#include "base/bind.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/profiler/scoped_tracker.h"
#include "base/strings/string_util.h"
diff --git a/chrome/browser/password_manager/password_store_win.h b/chrome/browser/password_manager/password_store_win.h
index 6287177..c096e4b 100644
--- a/chrome/browser/password_manager/password_store_win.h
+++ b/chrome/browser/password_manager/password_store_win.h
@@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_WIN_H_
#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_WIN_H_
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "components/password_manager/core/browser/password_store_default.h"
diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc
index 16208a7..54e01d0 100644
--- a/chrome/browser/password_manager/password_store_win_unittest.cc
+++ b/chrome/browser/password_manager/password_store_win_unittest.cc
@@ -10,6 +10,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/prefs/pref_service.h"
diff --git a/chrome/browser/password_manager/password_store_x.h b/chrome/browser/password_manager/password_store_x.h
index 0244849..dbd1c33 100644
--- a/chrome/browser/password_manager/password_store_x.h
+++ b/chrome/browser/password_manager/password_store_x.h
@@ -5,8 +5,11 @@
#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_X_H_
#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_X_H_
+#include <stddef.h>
+
#include <vector>
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/time/time.h"
diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc
index c951407..e524679 100644
--- a/chrome/browser/password_manager/password_store_x_unittest.cc
+++ b/chrome/browser/password_manager/password_store_x_unittest.cc
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+
#include <string>
-#include "base/basictypes.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/files/file_util.h"
diff --git a/chrome/browser/password_manager/save_password_infobar_delegate.h b/chrome/browser/password_manager/save_password_infobar_delegate.h
index 4dcf7fad..14f7a71 100644
--- a/chrome/browser/password_manager/save_password_infobar_delegate.h
+++ b/chrome/browser/password_manager/save_password_infobar_delegate.h
@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_PASSWORD_MANAGER_SAVE_PASSWORD_INFOBAR_DELEGATE_H_
#define CHROME_BROWSER_PASSWORD_MANAGER_SAVE_PASSWORD_INFOBAR_DELEGATE_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/timer/elapsed_timer.h"
#include "chrome/browser/password_manager/password_manager_infobar_delegate.h"
diff --git a/chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc b/chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc
index 4b9aaa6..dfad7a7 100644
--- a/chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc
+++ b/chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc
@@ -6,6 +6,7 @@
#include <string>
+#include "base/macros.h"
#include "base/prefs/pref_service.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/password_manager/simple_password_store_mac.h b/chrome/browser/password_manager/simple_password_store_mac.h
index f61e723..0f36dd2 100644
--- a/chrome/browser/password_manager/simple_password_store_mac.h
+++ b/chrome/browser/password_manager/simple_password_store_mac.h
@@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_PASSWORD_MANAGER_SIMPLE_PASSWORD_STORE_MAC_H_
#define CHROME_BROWSER_PASSWORD_MANAGER_SIMPLE_PASSWORD_STORE_MAC_H_
+#include "base/macros.h"
#include "components/password_manager/core/browser/password_store_default.h"
// The same as PasswordStoreDefault but running on the dedicated thread. The