diff options
| author | avi <avi@chromium.org> | 2015-12-25 18:10:43 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-26 02:11:32 +0000 |
| commit | b896c715dd14ec1f7ac800350b40eeb6de2ba868 (patch) | |
| tree | acc471478046a775c3492046a40c2ea84e8ea88a /chrome/browser/renderer_host/pepper/device_id_fetcher.cc | |
| parent | f5b61be8a18b07a2a928f10bf1f8f0e8a5358f13 (diff) | |
| download | chromium_src-b896c715dd14ec1f7ac800350b40eeb6de2ba868.zip chromium_src-b896c715dd14ec1f7ac800350b40eeb6de2ba868.tar.gz chromium_src-b896c715dd14ec1f7ac800350b40eeb6de2ba868.tar.bz2 | |
Switch to standard integer types in chrome/browser/, part 3 of 4.
BUG=138542
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/1548133002
Cr-Commit-Position: refs/heads/master@{#366883}
Diffstat (limited to 'chrome/browser/renderer_host/pepper/device_id_fetcher.cc')
| -rw-r--r-- | chrome/browser/renderer_host/pepper/device_id_fetcher.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/renderer_host/pepper/device_id_fetcher.cc b/chrome/browser/renderer_host/pepper/device_id_fetcher.cc index 3ec5777..cdba6b6 100644 --- a/chrome/browser/renderer_host/pepper/device_id_fetcher.cc +++ b/chrome/browser/renderer_host/pepper/device_id_fetcher.cc @@ -5,8 +5,10 @@ #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #if defined(OS_CHROMEOS) @@ -145,7 +147,7 @@ void DeviceIDFetcher::ComputeOnUIThread(const std::string& salt, // Build the identifier as follows: // SHA256(machine-id||service||SHA256(machine-id||service||salt)) - std::vector<uint8> salt_bytes; + std::vector<uint8_t> salt_bytes; if (!base::HexStringToBytes(salt, &salt_bytes)) salt_bytes.clear(); if (salt_bytes.size() != kSaltLength) { |