Index: chrome/browser/extensions/blob_reader.cc |
diff --git a/chrome/browser/extensions/blob_reader.cc b/chrome/browser/extensions/blob_reader.cc |
index dbcc2126da1079190458d0c25a36b94305ee2efe..43edf0e18da285795ac63389e799675248a64313 100644 |
--- a/chrome/browser/extensions/blob_reader.cc |
+++ b/chrome/browser/extensions/blob_reader.cc |
@@ -4,6 +4,8 @@ |
#include "chrome/browser/extensions/blob_reader.h" |
+#include <limits> |
+ |
#include "base/format_macros.h" |
#include "base/strings/string_util.h" |
#include "base/strings/stringprintf.h" |
@@ -35,11 +37,11 @@ BlobReader::BlobReader(Profile* profile, |
BlobReader::~BlobReader() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); } |
-void BlobReader::SetByteRange(int64 offset, int64 length) { |
+void BlobReader::SetByteRange(int64_t offset, int64_t length) { |
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
CHECK_GE(offset, 0); |
CHECK_GT(length, 0); |
- CHECK_LE(offset, kint64max - length); |
+ CHECK_LE(offset, std::numeric_limits<int64_t>::max() - length); |
net::HttpRequestHeaders headers; |
headers.SetHeader( |
@@ -58,7 +60,7 @@ void BlobReader::Start() { |
void BlobReader::OnURLFetchComplete(const net::URLFetcher* source) { |
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
scoped_ptr<std::string> response(new std::string); |
- int64 first = 0, last = 0, length = 0; |
+ int64_t first = 0, last = 0, length = 0; |
source->GetResponseAsString(response.get()); |
source->GetResponseHeaders()->GetContentRange(&first, &last, &length); |
callback_.Run(response.Pass(), length); |