chrome/browser/renderer_host/pepper/device_id_fetcher.cc - Issue 1548133002: Switch to standard integer types in chrome/browser/, part 3 of 4.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/renderer_host/pepper/device_id_fetcher.cc

Issue 1548133002: Switch to standard integer types in chrome/browser/, part 3 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/renderer_host/pepper/device_id_fetcher.h ('k') | chrome/browser/renderer_host/pepper/monitor_finder_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/pepper/device_id_fetcher.cc

diff --git a/chrome/browser/renderer_host/pepper/device_id_fetcher.cc b/chrome/browser/renderer_host/pepper/device_id_fetcher.cc

index 3ec57772c70b8bd1843904cb09b5c0d6190e0df6..cdba6b689a2ad67634652a3b2990440f35e07462 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) {