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

ui/display/edid_parser_unittest.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 "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ui {
@@ skipping 79 matching lines @@
     "\xB3\x00\xD1\xC0\xD1\x00\x28\x3C\x80\xA0\x70\xB0\x23\x40\x30\x20"
     "\x36\x00\x07\x44\x21\x00\x00\x1A\x00\x00\x00\xFD\x00\x30\x55\x1E"
     "\x5E\x15\x00\x0A\x20\x20\x20\x20\x20\x20\x00\x00\x00\xFC\x00\x48"
     "\x50\x20\x4C\x50\x32\x34\x36\x35\x0A\x20\x20\x20\x00\x00\x00\xFF"
     "\x00\x43\x4E\x4B\x38\x30\x32\x30\x34\x48\x4D\x0A\x20\x20\x00\x45";
 
 }  // namespace
 
 TEST(EDIDParserTest, ParseOverscanFlag) {
   bool flag = false;
-  std::vector<uint8> edid(
+  std::vector<uint8_t> edid(
       kNormalDisplay, kNormalDisplay + charsize(kNormalDisplay));
   EXPECT_FALSE(ParseOutputOverscanFlag(edid, &flag));
 
   flag = false;
   edid.assign(kInternalDisplay, kInternalDisplay + charsize(kInternalDisplay));
   EXPECT_FALSE(ParseOutputOverscanFlag(edid, &flag));
 
   flag = false;
   edid.assign(kOverscanDisplay, kOverscanDisplay + charsize(kOverscanDisplay));
   EXPECT_TRUE(ParseOutputOverscanFlag(edid, &flag));
   EXPECT_TRUE(flag);
 
   flag = false;
   edid.assign(
       kMisdetectedDisplay, kMisdetectedDisplay + charsize(kMisdetectedDisplay));
   EXPECT_FALSE(ParseOutputOverscanFlag(edid, &flag));
 
   flag = false;
   // Copy |kOverscanDisplay| and set flags to false in it. The overscan flags
   // are embedded at byte 150 in this specific example. Fix here too when the
   // contents of kOverscanDisplay is altered.
   edid.assign(kOverscanDisplay, kOverscanDisplay + charsize(kOverscanDisplay));
   edid[150] = '\0';
   EXPECT_TRUE(ParseOutputOverscanFlag(edid, &flag));
   EXPECT_FALSE(flag);
 }
 
 TEST(EDIDParserTest, ParseBrokenOverscanData) {
   // Do not fill valid data here because it anyway fails to parse the data.
-  std::vector<uint8> data;
+  std::vector<uint8_t> data;
   bool flag = false;
   EXPECT_FALSE(ParseOutputOverscanFlag(data, &flag));
   data.assign(126, '\0');
   EXPECT_FALSE(ParseOutputOverscanFlag(data, &flag));
 
   // extending data because ParseOutputOverscanFlag() will access the data.
   data.assign(128, '\0');
   // The number of CEA extensions is stored at byte 126.
   data[126] = '\x01';
   EXPECT_FALSE(ParseOutputOverscanFlag(data, &flag));
 
   data.assign(150, '\0');
   data[126] = '\x01';
   EXPECT_FALSE(ParseOutputOverscanFlag(data, &flag));
 }
 
 TEST(EDIDParserTest, ParseEDID) {
-  uint16 manufacturer_id = 0;
+  uint16_t manufacturer_id = 0;
   std::string human_readable_name;
-  std::vector<uint8> edid(
+  std::vector<uint8_t> edid(
       kNormalDisplay, kNormalDisplay + charsize(kNormalDisplay));
   EXPECT_TRUE(ParseOutputDeviceData(
       edid, &manufacturer_id, &human_readable_name));
   EXPECT_EQ(0x22f0u, manufacturer_id);
   EXPECT_EQ("HP ZR30w", human_readable_name);
 
   manufacturer_id = 0;
   human_readable_name.clear();
   edid.assign(kInternalDisplay, kInternalDisplay + charsize(kInternalDisplay));
   EXPECT_TRUE(ParseOutputDeviceData(edid, &manufacturer_id, NULL));
   EXPECT_EQ(0x4ca3u, manufacturer_id);
   EXPECT_EQ("", human_readable_name);
 
   // Internal display doesn't have name.
   EXPECT_TRUE(ParseOutputDeviceData(edid, NULL, &human_readable_name));
   EXPECT_TRUE(human_readable_name.empty());
 
   manufacturer_id = 0;
   human_readable_name.clear();
   edid.assign(kOverscanDisplay, kOverscanDisplay + charsize(kOverscanDisplay));
   EXPECT_TRUE(ParseOutputDeviceData(
       edid, &manufacturer_id, &human_readable_name));
   EXPECT_EQ(0x4c2du, manufacturer_id);
   EXPECT_EQ("SAMSUNG", human_readable_name);
 }
 
 TEST(EDIDParserTest, ParseBrokenEDID) {
-  uint16 manufacturer_id = 0;
+  uint16_t manufacturer_id = 0;
   std::string human_readable_name;
-  std::vector<uint8> edid;
+  std::vector<uint8_t> edid;
 
   // length == 0
   EXPECT_FALSE(ParseOutputDeviceData(
       edid, &manufacturer_id, &human_readable_name));
 
   // name is broken. Copying kNormalDisplay and substitute its name data by
   // some control code.
   edid.assign(kNormalDisplay, kNormalDisplay + charsize(kNormalDisplay));
 
   // display's name data is embedded in byte 95-107 in this specific example.
   // Fix here too when the contents of kNormalDisplay is altered.
   edid[97] = '\x1b';
   EXPECT_FALSE(ParseOutputDeviceData(
       edid, &manufacturer_id, &human_readable_name));
 
   // If |human_readable_name| isn't specified, it skips parsing the name.
   manufacturer_id = 0;
   EXPECT_TRUE(ParseOutputDeviceData(edid, &manufacturer_id, NULL));
   EXPECT_EQ(0x22f0u, manufacturer_id);
 }
 
 TEST(EDIDParserTest, GetDisplayId) {
   // EDID of kLP2565A and B are slightly different but actually the same device.
-  int64 id1 = -1;
-  int64 id2 = -1;
-  std::vector<uint8> edid(kLP2565A, kLP2565A + charsize(kLP2565A));
+  int64_t id1 = -1;
+  int64_t id2 = -1;
+  std::vector<uint8_t> edid(kLP2565A, kLP2565A + charsize(kLP2565A));
   EXPECT_TRUE(GetDisplayIdFromEDID(edid, 0, &id1));
   edid.assign(kLP2565B, kLP2565B + charsize(kLP2565B));
   EXPECT_TRUE(GetDisplayIdFromEDID(edid, 0, &id2));
   EXPECT_EQ(id1, id2);
   EXPECT_NE(-1, id1);
 }
 
 TEST(EDIDParserTest, GetDisplayIdFromInternal) {
-  int64 id = -1;
-  std::vector<uint8> edid(
+  int64_t id = -1;
+  std::vector<uint8_t> edid(
       kInternalDisplay, kInternalDisplay + charsize(kInternalDisplay));
   EXPECT_TRUE(GetDisplayIdFromEDID(edid, 0, &id));
   EXPECT_NE(-1, id);
 }
 
 TEST(EDIDParserTest, GetDisplayIdFailure) {
-  int64 id = -1;
-  std::vector<uint8> edid;
+  int64_t id = -1;
+  std::vector<uint8_t> edid;
   EXPECT_FALSE(GetDisplayIdFromEDID(edid, 0, &id));
   EXPECT_EQ(-1, id);
 }
 
 }   // namespace ui