Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(488)

Unified Diff: chrome/browser/safe_browsing/two_phase_uploader.cc

Issue 1502503004: Remove kuint64max. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@kint8
Patch Set: rebase 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
Index: chrome/browser/safe_browsing/two_phase_uploader.cc
diff --git a/chrome/browser/safe_browsing/two_phase_uploader.cc b/chrome/browser/safe_browsing/two_phase_uploader.cc
index aafecece4019e3dfae3eedf672e681aab0ed85a1..fca2c2adba25b142fc08283e147e6d0c56df1b31 100644
--- a/chrome/browser/safe_browsing/two_phase_uploader.cc
+++ b/chrome/browser/safe_browsing/two_phase_uploader.cc
@@ -4,7 +4,10 @@
#include "chrome/browser/safe_browsing/two_phase_uploader.h"
-#include "base/basictypes.h"
+#include <stdint.h>
+
+#include <limits>
+
#include "base/bind.h"
#include "base/task_runner.h"
#include "net/base/net_errors.h"
@@ -41,8 +44,8 @@ class TwoPhaseUploaderImpl : public net::URLFetcherDelegate,
// net::URLFetcherDelegate implementation:
void OnURLFetchComplete(const net::URLFetcher* source) override;
void OnURLFetchUploadProgress(const net::URLFetcher* source,
- int64 current,
- int64 total) override;
+ int64_t current,
+ int64_t total) override;
private:
void UploadMetadata();
@@ -143,13 +146,13 @@ void TwoPhaseUploaderImpl::OnURLFetchComplete(const net::URLFetcher* source) {
return;
default:
NOTREACHED();
- };
+ }
}
void TwoPhaseUploaderImpl::OnURLFetchUploadProgress(
const net::URLFetcher* source,
- int64 current,
- int64 total) {
+ int64_t current,
+ int64_t total) {
DCHECK(CalledOnValidThread());
DVLOG(3) << __FUNCTION__ << " " << source->GetURL().spec()
<< " " << current << "/" << total;
@@ -175,8 +178,9 @@ void TwoPhaseUploaderImpl::UploadFile() {
url_fetcher_ =
net::URLFetcher::Create(upload_url_, net::URLFetcher::PUT, this);
url_fetcher_->SetRequestContext(url_request_context_getter_.get());
- url_fetcher_->SetUploadFilePath(
- kUploadContentType, file_path_, 0, kuint64max, file_task_runner_);
+ url_fetcher_->SetUploadFilePath(kUploadContentType, file_path_, 0,
+ std::numeric_limits<uint64_t>::max(),
+ file_task_runner_);
url_fetcher_->Start();
}

Powered by Google App Engine
This is Rietveld 408576698