| Index: components/ownership/owner_key_util.h
|
| diff --git a/components/ownership/owner_key_util.h b/components/ownership/owner_key_util.h
|
| index 8cedd88c3a12807a26da19ed8821dc2d25a2f5b2..3a108d26af4689baae8deea6f5cb72bd50ab66a0 100644
|
| --- a/components/ownership/owner_key_util.h
|
| +++ b/components/ownership/owner_key_util.h
|
| @@ -5,10 +5,11 @@
|
| #ifndef COMPONENTS_OWNERSHIP_OWNER_KEY_UTIL_H_
|
| #define COMPONENTS_OWNERSHIP_OWNER_KEY_UTIL_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -28,7 +29,7 @@ class OWNERSHIP_EXPORT PublicKey
|
| public:
|
| PublicKey();
|
|
|
| - std::vector<uint8>& data() { return data_; }
|
| + std::vector<uint8_t>& data() { return data_; }
|
|
|
| bool is_loaded() const { return !data_.empty(); }
|
|
|
| @@ -42,7 +43,7 @@ class OWNERSHIP_EXPORT PublicKey
|
|
|
| virtual ~PublicKey();
|
|
|
| - std::vector<uint8> data_;
|
| + std::vector<uint8_t> data_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PublicKey);
|
| };
|
| @@ -73,13 +74,13 @@ class OWNERSHIP_EXPORT OwnerKeyUtil
|
| public:
|
| // Attempts to read the public key from the file system. Upon success,
|
| // returns true and populates |output|. False on failure.
|
| - virtual bool ImportPublicKey(std::vector<uint8>* output) = 0;
|
| + virtual bool ImportPublicKey(std::vector<uint8_t>* output) = 0;
|
|
|
| // Looks for the private key associated with |key| in the |slot|
|
| // and returns it if it can be found. Returns NULL otherwise.
|
| // Caller takes ownership.
|
| virtual crypto::ScopedSECKEYPrivateKey FindPrivateKeyInSlot(
|
| - const std::vector<uint8>& key,
|
| + const std::vector<uint8_t>& key,
|
| PK11SlotInfo* slot) = 0;
|
|
|
| // Checks whether the public key is present in the file system.
|
|
|