| Index: base/prefs/testing_pref_store.h
|
| diff --git a/base/prefs/testing_pref_store.h b/base/prefs/testing_pref_store.h
|
| index 72e61b3030d54b84f3a09be2bfb7c42064be07b3..713e69a7d4e07203102b5915f642a7a749eeeae7 100644
|
| --- a/base/prefs/testing_pref_store.h
|
| +++ b/base/prefs/testing_pref_store.h
|
| @@ -5,10 +5,12 @@
|
| #ifndef BASE_PREFS_TESTING_PREF_STORE_H_
|
| #define BASE_PREFS_TESTING_PREF_STORE_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <string>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| +#include "base/macros.h"
|
| #include "base/observer_list.h"
|
| #include "base/prefs/persistent_pref_store.h"
|
| #include "base/prefs/pref_value_map.h"
|
| @@ -30,14 +32,14 @@ class TestingPrefStore : public PersistentPrefStore {
|
|
|
| // PersistentPrefStore overrides:
|
| bool GetMutableValue(const std::string& key, base::Value** result) override;
|
| - void ReportValueChanged(const std::string& key, uint32 flags) override;
|
| + void ReportValueChanged(const std::string& key, uint32_t flags) override;
|
| void SetValue(const std::string& key,
|
| scoped_ptr<base::Value> value,
|
| - uint32 flags) override;
|
| + uint32_t flags) override;
|
| void SetValueSilently(const std::string& key,
|
| scoped_ptr<base::Value> value,
|
| - uint32 flags) override;
|
| - void RemoveValue(const std::string& key, uint32 flags) override;
|
| + uint32_t flags) override;
|
| + void RemoveValue(const std::string& key, uint32_t flags) override;
|
| bool ReadOnly() const override;
|
| PrefReadError GetReadError() const override;
|
| PersistentPrefStore::PrefReadError ReadPrefs() override;
|
|
|