diff options
Diffstat (limited to 'chrome/browser/profile_resetter')
14 files changed, 26 insertions, 8 deletions
diff --git a/chrome/browser/profile_resetter/brandcode_config_fetcher.cc b/chrome/browser/profile_resetter/brandcode_config_fetcher.cc index 117fa16..c381f6c 100644 --- a/chrome/browser/profile_resetter/brandcode_config_fetcher.cc +++ b/chrome/browser/profile_resetter/brandcode_config_fetcher.cc @@ -4,6 +4,9 @@ #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile_resetter/brandcoded_default_settings.h" diff --git a/chrome/browser/profile_resetter/brandcode_config_fetcher.h b/chrome/browser/profile_resetter/brandcode_config_fetcher.h index d0bc537..356ebf4 100644 --- a/chrome/browser/profile_resetter/brandcode_config_fetcher.h +++ b/chrome/browser/profile_resetter/brandcode_config_fetcher.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_PROFILE_RESETTER_BRANDCODE_CONFIG_FETCHER_H_ #define CHROME_BROWSER_PROFILE_RESETTER_BRANDCODE_CONFIG_FETCHER_H_ -#include "base/basictypes.h" #include "base/callback.h" +#include "base/macros.h" #include "base/timer/timer.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/chrome/browser/profile_resetter/brandcoded_default_settings.h b/chrome/browser/profile_resetter/brandcoded_default_settings.h index 2de4041..5365083 100644 --- a/chrome/browser/profile_resetter/brandcoded_default_settings.h +++ b/chrome/browser/profile_resetter/brandcoded_default_settings.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" diff --git a/chrome/browser/profile_resetter/profile_resetter.cc b/chrome/browser/profile_resetter/profile_resetter.cc index 346f47c..9db027b 100644 --- a/chrome/browser/profile_resetter/profile_resetter.cc +++ b/chrome/browser/profile_resetter/profile_resetter.cc @@ -4,11 +4,15 @@ #include "chrome/browser/profile_resetter/profile_resetter.h" +#include <stddef.h> + #include <string> +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/prefs/scoped_user_pref_update.h" #include "base/synchronization/cancellation_flag.h" +#include "build/build_config.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/profile_resetter/profile_resetter.h b/chrome/browser/profile_resetter/profile_resetter.h index e230a15..fad3dd6 100644 --- a/chrome/browser/profile_resetter/profile_resetter.h +++ b/chrome/browser/profile_resetter/profile_resetter.h @@ -5,12 +5,14 @@ #ifndef CHROME_BROWSER_PROFILE_RESETTER_PROFILE_RESETTER_H_ #define CHROME_BROWSER_PROFILE_RESETTER_PROFILE_RESETTER_H_ +#include <stdint.h> + #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/callback.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -50,7 +52,7 @@ class ProfileResetter : public base::NonThreadSafe, }; // Bit vector for Resettable enum. - typedef uint32 ResettableFlags; + typedef uint32_t ResettableFlags; static_assert(sizeof(ResettableFlags) == sizeof(Resettable), "ResettableFlags should be the same size as Resettable"); diff --git a/chrome/browser/profile_resetter/profile_resetter_browsertest.cc b/chrome/browser/profile_resetter/profile_resetter_browsertest.cc index 8b0581b..00dd1c3 100644 --- a/chrome/browser/profile_resetter/profile_resetter_browsertest.cc +++ b/chrome/browser/profile_resetter/profile_resetter_browsertest.cc @@ -5,6 +5,7 @@ #include "chrome/browser/profile_resetter/profile_resetter.h" #include "base/bind.h" +#include "base/macros.h" #include "chrome/browser/profile_resetter/profile_resetter_test_base.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/profile_resetter/profile_resetter_test_base.h b/chrome/browser/profile_resetter/profile_resetter_test_base.h index 178035c..29322d1 100644 --- a/chrome/browser/profile_resetter/profile_resetter_test_base.h +++ b/chrome/browser/profile_resetter/profile_resetter_test_base.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PROFILE_RESETTER_PROFILE_RESETTER_TEST_BASE_H_ #define CHROME_BROWSER_PROFILE_RESETTER_PROFILE_RESETTER_TEST_BASE_H_ +#include "base/macros.h" #include "chrome/browser/profile_resetter/profile_resetter.h" #include "content/public/test/test_utils.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc index 1378743..0543ea1 100644 --- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc +++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc @@ -4,11 +4,15 @@ #include "chrome/browser/profile_resetter/profile_resetter.h" +#include <stddef.h> + #include "base/json/json_string_value_serializer.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_path_override.h" +#include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service_test_base.h" diff --git a/chrome/browser/profile_resetter/reset_report_uploader.h b/chrome/browser/profile_resetter/reset_report_uploader.h index 791f0a2..a710c101 100644 --- a/chrome/browser/profile_resetter/reset_report_uploader.h +++ b/chrome/browser/profile_resetter/reset_report_uploader.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PROFILE_RESETTER_RESET_REPORT_UPLOADER_H_ #define CHROME_BROWSER_PROFILE_RESETTER_RESET_REPORT_UPLOADER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "components/keyed_service/core/keyed_service.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/chrome/browser/profile_resetter/reset_report_uploader_factory.h b/chrome/browser/profile_resetter/reset_report_uploader_factory.h index b32c7eb..dd4a01b 100644 --- a/chrome/browser/profile_resetter/reset_report_uploader_factory.h +++ b/chrome/browser/profile_resetter/reset_report_uploader_factory.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PROFILE_RESETTER_RESET_REPORT_UPLOADER_FACTORY_H_ #define CHROME_BROWSER_PROFILE_RESETTER_RESET_REPORT_UPLOADER_FACTORY_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" namespace base { diff --git a/chrome/browser/profile_resetter/resettable_settings_snapshot.h b/chrome/browser/profile_resetter/resettable_settings_snapshot.h index d935ded..55d78dd 100644 --- a/chrome/browser/profile_resetter/resettable_settings_snapshot.h +++ b/chrome/browser/profile_resetter/resettable_settings_snapshot.h @@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_split.h" diff --git a/chrome/browser/profile_resetter/triggered_profile_resetter.h b/chrome/browser/profile_resetter/triggered_profile_resetter.h index 7e27903..45aa88d 100644 --- a/chrome/browser/profile_resetter/triggered_profile_resetter.h +++ b/chrome/browser/profile_resetter/triggered_profile_resetter.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_PROFILE_RESETTER_TRIGGERED_PROFILE_RESETTER_H_ #define CHROME_BROWSER_PROFILE_RESETTER_TRIGGERED_PROFILE_RESETTER_H_ +#include <stddef.h> + #include "base/macros.h" #include "base/strings/string16.h" #include "components/keyed_service/core/keyed_service.h" diff --git a/chrome/browser/profile_resetter/triggered_profile_resetter_factory.cc b/chrome/browser/profile_resetter/triggered_profile_resetter_factory.cc index 10a2fea..625f69f 100644 --- a/chrome/browser/profile_resetter/triggered_profile_resetter_factory.cc +++ b/chrome/browser/profile_resetter/triggered_profile_resetter_factory.cc @@ -5,6 +5,7 @@ #include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h" #include "base/memory/singleton.h" +#include "build/build_config.h" #include "chrome/browser/profile_resetter/triggered_profile_resetter.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/profile_resetter/triggered_profile_resetter_win.cc b/chrome/browser/profile_resetter/triggered_profile_resetter_win.cc index d2e07c2..f29b432 100644 --- a/chrome/browser/profile_resetter/triggered_profile_resetter_win.cc +++ b/chrome/browser/profile_resetter/triggered_profile_resetter_win.cc @@ -60,7 +60,7 @@ void TriggeredProfileResetter::Activate() { // in this profile. If different, reset the profile and persist the new // time. PrefService* pref_service = profile_->GetPrefs(); - const int64 preference_timestamp = + const int64_t preference_timestamp = pref_service->GetInt64(prefs::kLastProfileResetTimestamp); if (profile_->IsNewProfile()) { |