diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/base/guid.h | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
| download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/base/guid.h')
| -rw-r--r-- | chromium/base/guid.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/base/guid.h b/chromium/base/guid.h index abcc589f72d..c0a06f8858e 100644 --- a/chromium/base/guid.h +++ b/chromium/base/guid.h @@ -5,10 +5,11 @@ #ifndef BASE_GUID_H_ #define BASE_GUID_H_ +#include <stdint.h> + #include <string> #include "base/base_export.h" -#include "base/basictypes.h" #include "build/build_config.h" namespace base { @@ -24,7 +25,7 @@ BASE_EXPORT bool IsValidGUID(const std::string& guid); #if defined(OS_POSIX) // For unit testing purposes only. Do not use outside of tests. -BASE_EXPORT std::string RandomDataToGUIDString(const uint64 bytes[2]); +BASE_EXPORT std::string RandomDataToGUIDString(const uint64_t bytes[2]); #endif } // namespace base |