| Index: components/cronet/android/cronet_in_memory_pref_store.h
|
| diff --git a/components/cronet/android/cronet_in_memory_pref_store.h b/components/cronet/android/cronet_in_memory_pref_store.h
|
| index 0887208f012c04ef30240888f97c7ccbb9c91750..1aede142fc4761d95905172c7cc72abe8b80ed0b 100644
|
| --- a/components/cronet/android/cronet_in_memory_pref_store.h
|
| +++ b/components/cronet/android/cronet_in_memory_pref_store.h
|
| @@ -5,10 +5,12 @@
|
| #ifndef COMPONENTS_CRONET_ANDROID_CRONET_IN_MEMORY_PREF_STORE_H_
|
| #define COMPONENTS_CRONET_ANDROID_CRONET_IN_MEMORY_PREF_STORE_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <string>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "base/prefs/persistent_pref_store.h"
|
| @@ -35,14 +37,14 @@ class CronetInMemoryPrefStore : 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;
|
|
|