Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Unified Diff: ui/display/edid_parser_unittest.cc

Issue 215233002: Update ui/display to use primitive types as defined in stdint.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/display/edid_parser.cc ('k') | ui/display/x11/edid_parser_x11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/edid_parser_unittest.cc
diff --git a/ui/display/edid_parser_unittest.cc b/ui/display/edid_parser_unittest.cc
index 9335804d730e6c0ebca64c9045e4a2bc8e215956..cac630e860a23032eccda24abff0ff5ecd2e34ed 100644
--- a/ui/display/edid_parser_unittest.cc
+++ b/ui/display/edid_parser_unittest.cc
@@ -97,7 +97,7 @@ const unsigned char kLP2565B[] =
TEST(EDIDParserTest, ParseOverscanFlag) {
bool flag = false;
- std::vector<uint8> edid(
+ std::vector<uint8_t> edid(
kNormalDisplay, kNormalDisplay + charsize(kNormalDisplay));
EXPECT_FALSE(ParseOutputOverscanFlag(edid, &flag));
@@ -127,7 +127,7 @@ TEST(EDIDParserTest, ParseOverscanFlag) {
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');
@@ -145,9 +145,9 @@ TEST(EDIDParserTest, ParseBrokenOverscanData) {
}
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));
@@ -175,9 +175,9 @@ TEST(EDIDParserTest, ParseEDID) {
}
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(
@@ -201,9 +201,9 @@ TEST(EDIDParserTest, ParseBrokenEDID) {
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));
@@ -212,16 +212,16 @@ TEST(EDIDParserTest, GetDisplayId) {
}
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);
}
« no previous file with comments | « ui/display/edid_parser.cc ('k') | ui/display/x11/edid_parser_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698