Update ui/display to use primitive types as defined in stdint.h

ui/display/edid_parser.cc

 // Copyright 2014 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 "ui/display/edid_parser.h"
 
 #include <algorithm>
 
 #include "base/hash.h"
 #include "base/strings/string_util.h"
 #include "base/sys_byteorder.h"
 
 namespace ui {
 
 namespace {
 
 // Returns 64-bit persistent ID for the specified manufacturer's ID and
 // product_code_hash, and the index of the output it is connected to.
 // |output_index| is used to distinguish the displays of the same type. For
 // example, swapping two identical display between two outputs will not be
 // treated as swap. The 'serial number' field in EDID isn't used here because
 // it is not guaranteed to have unique number and it may have the same fixed
 // value (like 0).
-int64 GetID(uint16 manufacturer_id,
-            uint32 product_code_hash,
-            uint8 output_index) {
-  return ((static_cast<int64>(manufacturer_id) << 40) |
-          (static_cast<int64>(product_code_hash) << 8) | output_index);
+int64_t GetID(uint16_t manufacturer_id,
+              uint32_t product_code_hash,
+              uint8_t output_index) {
+  return ((static_cast<int64_t>(manufacturer_id) << 40) |
+          (static_cast<int64_t>(product_code_hash) << 8) | output_index);
 }
 
 }  // namespace
 
-bool GetDisplayIdFromEDID(const std::vector<uint8>& edid,
-                          uint8 output_index,
-                          int64* display_id_out) {
-  uint16 manufacturer_id = 0;
+bool GetDisplayIdFromEDID(const std::vector<uint8_t>& edid,
+                          uint8_t output_index,
+                          int64_t* display_id_out) {
+  uint16_t manufacturer_id = 0;
   std::string product_name;
 
   // ParseOutputDeviceData fails if it doesn't have product_name.
   ParseOutputDeviceData(edid, &manufacturer_id, &product_name);
 
   // Generates product specific value from product_name instead of product code.
   // See crbug.com/240341
-  uint32 product_code_hash = product_name.empty() ?
+  uint32_t product_code_hash = product_name.empty() ?
       0 : base::Hash(product_name);
   if (manufacturer_id != 0) {
     // An ID based on display's index will be assigned later if this call
     // fails.
     *display_id_out = GetID(
         manufacturer_id, product_code_hash, output_index);
     return true;
   }
   return false;
 }
 
-bool ParseOutputDeviceData(const std::vector<uint8>& edid,
-                           uint16* manufacturer_id,
+bool ParseOutputDeviceData(const std::vector<uint8_t>& edid,
+                           uint16_t* manufacturer_id,
                            std::string* human_readable_name) {
   // See http://en.wikipedia.org/wiki/Extended_display_identification_data
   // for the details of EDID data format.  We use the following data:
   //   bytes 8-9: manufacturer EISA ID, in big-endian
   //   bytes 54-125: four descriptors (18-bytes each) which may contain
   //     the display name.
   const unsigned int kManufacturerOffset = 8;
   const unsigned int kManufacturerLength = 2;
   const unsigned int kDescriptorOffset = 54;
   const unsigned int kNumDescriptors = 4;
   const unsigned int kDescriptorLength = 18;
   // The specifier types.
   const unsigned char kMonitorNameDescriptor = 0xfc;
 
   if (manufacturer_id) {
     if (edid.size() < kManufacturerOffset + kManufacturerLength) {
       LOG(ERROR) << "too short EDID data: manifacturer id";
       return false;
     }
 
     *manufacturer_id =
-        *reinterpret_cast<const uint16*>(&edid[kManufacturerOffset]);
+        *reinterpret_cast<const uint16_t*>(&edid[kManufacturerOffset]);
 #if defined(ARCH_CPU_LITTLE_ENDIAN)
     *manufacturer_id = base::ByteSwap(*manufacturer_id);
 #endif
   }
 
   if (!human_readable_name)
     return true;
 
   human_readable_name->clear();
   for (unsigned int i = 0; i < kNumDescriptors; ++i) {
@@ skipping 24 matching lines @@
     if (!isascii(c) || !isprint(c)) {
       human_readable_name->clear();
       LOG(ERROR) << "invalid EDID: human unreadable char in name";
       return false;
     }
   }
 
   return true;
 }
 
-bool ParseOutputOverscanFlag(const std::vector<uint8>& edid,
+bool ParseOutputOverscanFlag(const std::vector<uint8_t>& edid,
                              bool* flag) {
   // See http://en.wikipedia.org/wiki/Extended_display_identification_data
   // for the extension format of EDID.  Also see EIA/CEA-861 spec for
   // the format of the extensions and how video capability is encoded.
   //  - byte 0: tag.  should be 02h.
   //  - byte 1: revision.  only cares revision 3 (03h).
   //  - byte 4-: data block.
   const unsigned int kExtensionBase = 128;
   const unsigned int kExtensionSize = 128;
   const unsigned int kNumExtensionsOffset = 126;
@@ skipping 53 matching lines @@
         *flag = false;
       }
       return true;
     }
   }
 
   return false;
 }
 
 }  // namespace ui