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

Unified Diff: content/test/image_decoder_test.cc

Issue 1544273002: Switch to standard integer types in content/. (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 | « content/test/image_decoder_test.h ('k') | content/test/layouttest_support.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/image_decoder_test.cc
diff --git a/content/test/image_decoder_test.cc b/content/test/image_decoder_test.cc
index 3861f38bc46c41eadbe6ff9b200c91f60861a363..f7ce4bf9430b625b3214e09bfd65df86a3823c35 100644
--- a/content/test/image_decoder_test.cc
+++ b/content/test/image_decoder_test.cc
@@ -4,6 +4,8 @@
#include "content/test/image_decoder_test.h"
+#include <stddef.h>
+
#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
@@ -13,6 +15,7 @@
#include "base/strings/pattern.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
#include "third_party/WebKit/public/platform/WebData.h"
#include "third_party/WebKit/public/platform/WebImage.h"
#include "third_party/WebKit/public/platform/WebSize.h"
@@ -29,11 +32,11 @@ const int kFirstFrameIndex = 0;
// on |file_selection| and the |threshold| for the file size.
bool ShouldSkipFile(const base::FilePath& path,
ImageDecoderTestFileSelection file_selection,
- const int64 threshold) {
+ const int64_t threshold) {
if (file_selection == TEST_ALL)
return false;
- int64 image_size = 0;
+ int64_t image_size = 0;
base::GetFileSize(path, &image_size);
return (file_selection == TEST_SMALLER) == (image_size > threshold);
}
@@ -150,7 +153,7 @@ bool ImageDecoderTest::ShouldImageFail(const base::FilePath& path) const {
void ImageDecoderTest::TestDecoding(
ImageDecoderTestFileSelection file_selection,
- const int64 threshold) {
+ const int64_t threshold) {
if (data_dir_.empty())
return;
const std::vector<base::FilePath> image_files(GetImageFiles());
« no previous file with comments | « content/test/image_decoder_test.h ('k') | content/test/layouttest_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698