Switch to standard integer types in content/browser/.

content/browser/download/save_package_unittest.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 <stddef.h>
+#include <stdint.h>
+
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "content/browser/download/save_package.h"
 #include "content/public/common/url_constants.h"
 #include "content/test/test_render_view_host.h"
 #include "content/test/test_web_contents.h"
 #include "net/test/url_request/url_request_mock_http_job.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace content {
 
 #define FPL FILE_PATH_LITERAL
 #define HTML_EXTENSION ".html"
 #if defined(OS_WIN)
 #define FPL_HTML_EXTENSION L".html"
 #else
 #define FPL_HTML_EXTENSION ".html"
 #endif
 
 namespace {
 
 // This constant copied from save_package.cc.
 #if defined(OS_WIN)
-const uint32 kMaxFilePathLength = MAX_PATH - 1;
-const uint32 kMaxFileNameLength = MAX_PATH - 1;
+const uint32_t kMaxFilePathLength = MAX_PATH - 1;
+const uint32_t kMaxFileNameLength = MAX_PATH - 1;
 #elif defined(OS_POSIX)
-const uint32 kMaxFilePathLength = PATH_MAX - 1;
-const uint32 kMaxFileNameLength = NAME_MAX;
+const uint32_t kMaxFilePathLength = PATH_MAX - 1;
+const uint32_t kMaxFileNameLength = NAME_MAX;
 #endif
 
 // Used to make long filenames.
 std::string long_file_name(
     "EFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz01234567"
     "89ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz012345"
     "6789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz0123"
     "456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789a");
 
 bool HasOrdinalNumber(const base::FilePath::StringType& filename) {
@@ skipping 193 matching lines @@
   const base::FilePath save_dir(FPL("test_dir"));
   const base::FilePath::StringType ext(FPL_HTML_EXTENSION);
   base::FilePath::StringType filename =
 #if defined(OS_WIN)
       base::ASCIIToUTF16(long_file_name);
 #else
       long_file_name;
 #endif
 
   // Test that the filename + extension doesn't exceed kMaxFileNameLength
-  uint32 max_path = SavePackage::GetMaxPathLengthForDirectory(save_dir);
+  uint32_t max_path = SavePackage::GetMaxPathLengthForDirectory(save_dir);
   ASSERT_TRUE(SavePackage::GetSafePureFileName(save_dir, ext, max_path,
                                                &filename));
   EXPECT_TRUE(filename.length() <= kMaxFileNameLength-ext.length());
 }
 
 static const struct {
   const base::FilePath::CharType* page_title;
   const base::FilePath::CharType* expected_name;
 } kExtensionTestCases[] = {
   // Extension is preserved if it is already proper for HTML.
@@ skipping 56 matching lines @@
     { FPL("filename.html"), FPL("filename.html"),
       "application/xhtml+xml" },
     { FPL("filename"), FPL("filename.xhtml"), "application/xhtml+xml" },
     { FPL("filename.txt"), FPL("filename.txt"), "text/plain" },
     { FPL("filename"), FPL("filename.txt"), "text/plain" },
     { FPL("filename.css"), FPL("filename.css"), "text/css" },
     { FPL("filename"), FPL("filename.css"), "text/css" },
     { FPL("filename.abc"), FPL("filename.abc"), "unknown/unknown" },
     { FPL("filename"), FPL("filename"), "unknown/unknown" },
   };
-  for (uint32 i = 0; i < arraysize(kExtensionTests); ++i) {
+  for (uint32_t i = 0; i < arraysize(kExtensionTests); ++i) {
     base::FilePath original = base::FilePath(kExtensionTests[i].page_title);
     base::FilePath expected = base::FilePath(kExtensionTests[i].expected_name);
     std::string mime_type(kExtensionTests[i].contents_mime_type);
     base::FilePath actual = EnsureMimeExtension(original, mime_type);
     EXPECT_EQ(expected.value(), actual.value()) << "Failed for page title: " <<
         kExtensionTests[i].page_title << " MIME:" << mime_type;
   }
 }
 
 // Test that the suggested names generated by SavePackage are reasonable:
@@ skipping 84 matching lines @@
   GURL mock_url = net::URLRequestMockHTTPJob::GetMockUrl("save_page/a.htm");
   GURL view_source_url =
       GURL(kViewSourceScheme + std::string(":") + mock_url.spec());
   GURL actual_url = net::URLRequestMockHTTPJob::GetMockUrl("save_page/a.htm");
   NavigateAndCommit(view_source_url);
   EXPECT_EQ(actual_url, GetUrlToBeSaved());
   EXPECT_EQ(view_source_url, contents()->GetLastCommittedURL());
 }
 
 }  // namespace content