summaryrefslogtreecommitdiffstats
path: root/chrome/browser/safe_browsing/download_protection_service.cc
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2015-12-25 18:10:43 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-26 02:11:32 +0000
commitb896c715dd14ec1f7ac800350b40eeb6de2ba868 (patch)
treeacc471478046a775c3492046a40c2ea84e8ea88a /chrome/browser/safe_browsing/download_protection_service.cc
parentf5b61be8a18b07a2a928f10bf1f8f0e8a5358f13 (diff)
downloadchromium_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/safe_browsing/download_protection_service.cc')
-rw-r--r--chrome/browser/safe_browsing/download_protection_service.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc
index b667456..6c0d349 100644
--- a/chrome/browser/safe_browsing/download_protection_service.cc
+++ b/chrome/browser/safe_browsing/download_protection_service.cc
@@ -4,10 +4,13 @@
#include "chrome/browser/safe_browsing/download_protection_service.h"
+#include <stddef.h>
+
#include "base/bind.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/format_macros.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/metrics/field_trial.h"
@@ -23,6 +26,7 @@
#include "base/task/cancelable_task_tracker.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/time/time.h"
+#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/history/history_service_factory.h"
#include "chrome/browser/profiles/profile.h"
@@ -63,7 +67,7 @@
using content::BrowserThread;
namespace {
-static const int64 kDownloadRequestTimeoutMs = 7000;
+static const int64_t kDownloadRequestTimeoutMs = 7000;
} // namespace
namespace safe_browsing {
@@ -1061,7 +1065,7 @@ void DownloadProtectionService::ParseManualBlacklistFlag() {
command_line->GetSwitchValueASCII(switches::kSbManualDownloadBlacklist);
for (const std::string& hash_hex : base::SplitString(
flag_val, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) {
- std::vector<uint8> bytes;
+ std::vector<uint8_t> bytes;
if (base::HexStringToBytes(hash_hex, &bytes) && bytes.size() == 32) {
manual_blacklist_hashes_.insert(
std::string(bytes.begin(), bytes.end()));