Remove kuint8max.

media/cdm/ppapi/cdm_file_io_test.cc

 // Copyright 2013 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 "media/cdm/ppapi/cdm_file_io_test.h"
 
+#include <limits>
+
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 
 namespace media {
 
 #define FILE_IO_DVLOG(level) DVLOG(level) << "File IO Test: "
 
-const uint8 kData[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                        0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f };
-const uint32 kDataSize = arraysize(kData);
+const uint8_t kData[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                         0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f};
+const uint32_t kDataSize = arraysize(kData);
 
-const uint8 kBigData[] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
-                           0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
-                           0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
-                           0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
-                           0x00 };
-const uint32 kBigDataSize = arraysize(kBigData);
+const uint8_t kBigData[] = {
+    0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa,
+    0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x00, 0x11, 0x22, 0x33, 0x44, 0x55,
+    0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x00};
+const uint32_t kBigDataSize = arraysize(kBigData);
 
 // Must be > kReadSize in cdm_file_io_impl.cc.
-const uint32 kLargeDataSize = 20 * 1024 + 7;
+const uint32_t kLargeDataSize = 20 * 1024 + 7;
 
 // Macros to help add test cases/steps.
 
 // |test_name| is also used as the file name. File name validity tests relies
 // on this to work.
 #define START_TEST_CASE(test_name)                                     \
   do {                                                                 \
     FileIOTest test_case(create_file_io_cb_, test_name);               \
     CREATE_FILE_IO  // Create FileIO for each test case.
 
@@ skipping 31 matching lines @@
 
 // FileIOTestRunner implementation.
 
 FileIOTestRunner::FileIOTestRunner(const CreateFileIOCB& create_file_io_cb)
     : create_file_io_cb_(create_file_io_cb),
       total_num_tests_(0),
       num_passed_tests_(0) {
   // Generate |large_data_|.
   large_data_.resize(kLargeDataSize);
   for (size_t i = 0; i < kLargeDataSize; ++i)
-    large_data_[i] = i % kuint8max;
+    large_data_[i] = i % std::numeric_limits<uint8_t>::max();
 
   AddTests();
 }
 
 FileIOTestRunner::~FileIOTestRunner() {
   if (remaining_tests_.empty())
     return;
 
   DCHECK_LT(num_passed_tests_, total_num_tests_);
   FILE_IO_DVLOG(1) << "Not Finished (probably due to timeout). "
@@ skipping 375 matching lines @@
 
 // FileIOTest implementation.
 
 FileIOTest::FileIOTest(const CreateFileIOCB& create_file_io_cb,
                        const std::string& test_name)
     : create_file_io_cb_(create_file_io_cb),
       test_name_(test_name) {}
 
 FileIOTest::~FileIOTest() {}
 
-void FileIOTest::AddTestStep(
-    StepType type, Status status, const uint8* data, uint32 data_size) {
+void FileIOTest::AddTestStep(StepType type,
+                             Status status,
+                             const uint8_t* data,
+                             uint32_t data_size) {
   test_steps_.push_back(TestStep(type, status, data, data_size));
 }
 
 void FileIOTest::Run(const CompletionCB& completion_cb) {
   FILE_IO_DVLOG(3) << "Run " << test_name_;
   completion_cb_ = completion_cb;
   DCHECK(!test_steps_.empty() && !IsResult(test_steps_.front()));
   RunNextStep();
 }
 
@@ skipping 117 matching lines @@
 void FileIOTest::OnTestComplete(bool success) {
   while (!file_io_stack_.empty()) {
     file_io_stack_.top()->Close();
     file_io_stack_.pop();
   }
   FILE_IO_DVLOG(3) << test_name_ << (success ? " PASSED" : " FAILED");
   base::ResetAndReturn(&completion_cb_).Run(success);
 }
 
 }  // namespace media