Index: chromeos/dbus/fake_cryptohome_client.h |
diff --git a/chromeos/dbus/fake_cryptohome_client.h b/chromeos/dbus/fake_cryptohome_client.h |
index 7064a2ee7c8c23c5b61ead527a72728a2a213774..801faafedb1db476d509a390bd011ec33ddde5ce 100644 |
--- a/chromeos/dbus/fake_cryptohome_client.h |
+++ b/chromeos/dbus/fake_cryptohome_client.h |
@@ -5,9 +5,11 @@ |
#ifndef CHROMEOS_DBUS_FAKE_CRYPTOHOME_CLIENT_H_ |
#define CHROMEOS_DBUS_FAKE_CRYPTOHOME_CLIENT_H_ |
+#include <stdint.h> |
+ |
#include <map> |
-#include "base/basictypes.h" |
+#include "base/macros.h" |
#include "base/memory/weak_ptr.h" |
#include "chromeos/dbus/cryptohome_client.h" |
@@ -71,10 +73,10 @@ class CHROMEOS_EXPORT FakeCryptohomeClient : public CryptohomeClient { |
const std::string& username, |
const Pkcs11GetTpmTokenInfoCallback& callback) override; |
bool InstallAttributesGet(const std::string& name, |
- std::vector<uint8>* value, |
+ std::vector<uint8_t>* value, |
bool* successful) override; |
bool InstallAttributesSet(const std::string& name, |
- const std::vector<uint8>& value, |
+ const std::vector<uint8_t>& value, |
bool* successful) override; |
bool InstallAttributesFinalize(bool* successful) override; |
void InstallAttributesIsReady( |
@@ -195,13 +197,13 @@ class CHROMEOS_EXPORT FakeCryptohomeClient : public CryptohomeClient { |
// Sets the system salt which will be returned from GetSystemSalt(). By |
// default, GetSystemSalt() returns the value generated by |
// GetStubSystemSalt(). |
- void set_system_salt(const std::vector<uint8>& system_salt) { |
+ void set_system_salt(const std::vector<uint8_t>& system_salt) { |
system_salt_ = system_salt; |
} |
// Returns the stub system salt as raw bytes. (not as a string encoded in the |
// format used by SystemSaltGetter::ConvertRawSaltToHexString()). |
- static std::vector<uint8> GetStubSystemSalt(); |
+ static std::vector<uint8_t> GetStubSystemSalt(); |
private: |
void ReturnProtobufMethodCallback( |
@@ -221,14 +223,14 @@ class CHROMEOS_EXPORT FakeCryptohomeClient : public CryptohomeClient { |
AsyncCallStatusHandler async_call_status_handler_; |
AsyncCallStatusWithDataHandler async_call_status_data_handler_; |
bool unmount_result_; |
- std::vector<uint8> system_salt_; |
+ std::vector<uint8_t> system_salt_; |
std::vector<WaitForServiceToBeAvailableCallback> |
pending_wait_for_service_to_be_available_callbacks_; |
// A stub store for InstallAttributes, mapping an attribute name to the |
// associated data blob. Used to implement InstallAttributesSet and -Get. |
- std::map<std::string, std::vector<uint8> > install_attrs_; |
+ std::map<std::string, std::vector<uint8_t>> install_attrs_; |
bool locked_; |
base::WeakPtrFactory<FakeCryptohomeClient> weak_ptr_factory_; |