Switch to standard integer types in content/.

content/test/image_decoder_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #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"
 #include "third_party/WebKit/public/web/WebImageDecoder.h"
 
 // Uncomment this to recalculate the MD5 sums; see header comments.
 // #define CALCULATE_MD5_SUMS
 
 namespace {
 
 const int kFirstFrameIndex = 0;
 
 // Determine if we should test with file specified by |path| based
 // 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);
 }
 
 }  // namespace
 
 void ReadFileToVector(const base::FilePath& path, std::vector<char>* contents) {
   std::string raw_image_data;
   base::ReadFileToString(path, &raw_image_data);
   contents->resize(raw_image_data.size());
@@ skipping 96 matching lines @@
 bool ImageDecoderTest::ShouldImageFail(const base::FilePath& path) const {
   const base::FilePath::StringType kBadSuffix(FILE_PATH_LITERAL(".bad."));
   return (path.value().length() > (kBadSuffix.length() + format_.length()) &&
           !path.value().compare(path.value().length() - format_.length() -
                                     kBadSuffix.length(),
                                 kBadSuffix.length(), kBadSuffix));
 }
 
 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());
   for (std::vector<base::FilePath>::const_iterator i = image_files.begin();
        i != image_files.end(); ++i) {
     if (!ShouldSkipFile(*i, file_selection, threshold))
       TestWebKitImageDecoder(*i, GetMD5SumPath(*i), kFirstFrameIndex);
   }
 }
 
@@ skipping 38 matching lines @@
     EXPECT_TRUE(decoder->isFailed());
   } else {
     EXPECT_FALSE(decoder->isFailed()) << image_path.value();
 #if defined(CALCULATE_MD5_SUMS)
     SaveMD5Sum(md5_sum_path, decoder->getFrameAtIndex(desired_frame_index));
 #else
     VerifyImage(*decoder, image_path, md5_sum_path, desired_frame_index);
 #endif
   }
 }