Switch to standard integer types in media/.

media/midi/usb_midi_output_stream_unittest.cc

Index: media/midi/usb_midi_output_stream_unittest.cc
diff --git a/media/midi/usb_midi_output_stream_unittest.cc b/media/midi/usb_midi_output_stream_unittest.cc
index b0e2d5be55fd235febfcba32179aef169c2474af..19c8d94f0a47f36e38d24f55c80fb144570e4e86 100644
--- a/media/midi/usb_midi_output_stream_unittest.cc
+++ b/media/midi/usb_midi_output_stream_unittest.cc
@@ -27,12 +27,14 @@ class MockUsbMidiDevice : public UsbMidiDevice {
   MockUsbMidiDevice() {}
   ~MockUsbMidiDevice() override {}
 
-  std::vector<uint8> GetDescriptors() override { return std::vector<uint8>(); }
+  std::vector<uint8_t> GetDescriptors() override {
+    return std::vector<uint8_t>();
+  }
   std::string GetManufacturer() override { return std::string(); }
   std::string GetProductName() override { return std::string(); }
   std::string GetDeviceVersion() override { return std::string(); }
 
-  void Send(int endpoint_number, const std::vector<uint8>& data) override {
+  void Send(int endpoint_number, const std::vector<uint8_t>& data) override {
     for (size_t i = 0; i < data.size(); ++i) {
       log_ += base::StringPrintf("0x%02x ", data[i]);
     }
@@ -64,35 +66,39 @@ class UsbMidiOutputStreamTest : public ::testing::Test {
 };
 
 TEST_F(UsbMidiOutputStreamTest, SendEmpty) {
-  stream_->Send(std::vector<uint8>());
+  stream_->Send(std::vector<uint8_t>());
 
   EXPECT_EQ("", device_.log());
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendNoteOn) {
-  uint8 data[] = { 0x90, 0x45, 0x7f};
+  uint8_t data[] = {0x90, 0x45, 0x7f};
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x29 0x90 0x45 0x7f (endpoint = 4)\n", device_.log());
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendNoteOnPending) {
-  stream_->Send(std::vector<uint8>(1, 0x90));
-  stream_->Send(std::vector<uint8>(1, 0x45));
+  stream_->Send(std::vector<uint8_t>(1, 0x90));
+  stream_->Send(std::vector<uint8_t>(1, 0x45));
   EXPECT_EQ("", device_.log());
 
-  stream_->Send(std::vector<uint8>(1, 0x7f));
+  stream_->Send(std::vector<uint8_t>(1, 0x7f));
   EXPECT_EQ("0x29 0x90 0x45 0x7f (endpoint = 4)\n", device_.log());
   device_.ClearLog();
 
-  stream_->Send(std::vector<uint8>(1, 0x90));
-  stream_->Send(std::vector<uint8>(1, 0x45));
+  stream_->Send(std::vector<uint8_t>(1, 0x90));
+  stream_->Send(std::vector<uint8_t>(1, 0x45));
   EXPECT_EQ("", device_.log());
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendNoteOnBurst) {
-  uint8 data1[] = { 0x90, };
-  uint8 data2[] = { 0x45, 0x7f, 0x90, 0x45, 0x71, 0x90, 0x45, 0x72, 0x90, };
+  uint8_t data1[] = {
+      0x90,
+  };
+  uint8_t data2[] = {
+      0x45, 0x7f, 0x90, 0x45, 0x71, 0x90, 0x45, 0x72, 0x90,
+  };
 
   stream_->Send(ToVector(data1));
   stream_->Send(ToVector(data2));
@@ -102,63 +108,81 @@ TEST_F(UsbMidiOutputStreamTest, SendNoteOnBurst) {
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendNoteOff) {
-  uint8 data[] = { 0x80, 0x33, 0x44, };
+  uint8_t data[] = {
+      0x80, 0x33, 0x44,
+  };
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x28 0x80 0x33 0x44 (endpoint = 4)\n", device_.log());
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendPolyphonicKeyPress) {
-  uint8 data[] = { 0xa0, 0x33, 0x44, };
+  uint8_t data[] = {
+      0xa0, 0x33, 0x44,
+  };
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x2a 0xa0 0x33 0x44 (endpoint = 4)\n", device_.log());
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendControlChange) {
-  uint8 data[] = { 0xb7, 0x33, 0x44, };
+  uint8_t data[] = {
+      0xb7, 0x33, 0x44,
+  };
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x2b 0xb7 0x33 0x44 (endpoint = 4)\n", device_.log());
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendProgramChange) {
-  uint8 data[] = { 0xc2, 0x33, };
+  uint8_t data[] = {
+      0xc2, 0x33,
+  };
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x2c 0xc2 0x33 0x00 (endpoint = 4)\n", device_.log());
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendChannelPressure) {
-  uint8 data[] = { 0xd1, 0x33, 0x44, };
+  uint8_t data[] = {
+      0xd1, 0x33, 0x44,
+  };
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x2d 0xd1 0x33 0x44 (endpoint = 4)\n", device_.log());
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendPitchWheelChange) {
-  uint8 data[] = { 0xe4, 0x33, 0x44, };
+  uint8_t data[] = {
+      0xe4, 0x33, 0x44,
+  };
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x2e 0xe4 0x33 0x44 (endpoint = 4)\n", device_.log());
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendTwoByteSysEx) {
-  uint8 data[] = { 0xf0, 0xf7, };
+  uint8_t data[] = {
+      0xf0, 0xf7,
+  };
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x26 0xf0 0xf7 0x00 (endpoint = 4)\n", device_.log());
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendThreeByteSysEx) {
-  uint8 data[] = { 0xf0, 0x4f, 0xf7, };
+  uint8_t data[] = {
+      0xf0, 0x4f, 0xf7,
+  };
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x27 0xf0 0x4f 0xf7 (endpoint = 4)\n", device_.log());
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendFourByteSysEx) {
-  uint8 data[] = { 0xf0, 0x00, 0x01, 0xf7, };
+  uint8_t data[] = {
+      0xf0, 0x00, 0x01, 0xf7,
+  };
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x24 0xf0 0x00 0x01 "
@@ -166,7 +190,9 @@ TEST_F(UsbMidiOutputStreamTest, SendFourByteSysEx) {
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendFiveByteSysEx) {
-  uint8 data[] = { 0xf0, 0x00, 0x01, 0x02, 0xf7, };
+  uint8_t data[] = {
+      0xf0, 0x00, 0x01, 0x02, 0xf7,
+  };
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x24 0xf0 0x00 0x01 "
@@ -174,7 +200,9 @@ TEST_F(UsbMidiOutputStreamTest, SendFiveByteSysEx) {
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendSixByteSysEx) {
-  uint8 data[] = { 0xf0, 0x00, 0x01, 0x02, 0x03, 0xf7, };
+  uint8_t data[] = {
+      0xf0, 0x00, 0x01, 0x02, 0x03, 0xf7,
+  };
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x24 0xf0 0x00 0x01 "
@@ -182,9 +210,15 @@ TEST_F(UsbMidiOutputStreamTest, SendSixByteSysEx) {
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendPendingSysEx) {
-  uint8 data1[] = { 0xf0, 0x33, };
-  uint8 data2[] = { 0x44, 0x55, 0x66, };
-  uint8 data3[] = { 0x77, 0x88, 0x99, 0xf7, };
+  uint8_t data1[] = {
+      0xf0, 0x33,
+  };
+  uint8_t data2[] = {
+      0x44, 0x55, 0x66,
+  };
+  uint8_t data3[] = {
+      0x77, 0x88, 0x99, 0xf7,
+  };
 
   stream_->Send(ToVector(data1));
   EXPECT_EQ("", device_.log());
@@ -199,7 +233,9 @@ TEST_F(UsbMidiOutputStreamTest, SendPendingSysEx) {
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendNoteOnAfterSysEx) {
-  uint8 data[] = { 0xf0, 0x00, 0x01, 0x02, 0x03, 0xf7, 0x90, 0x44, 0x33, };
+  uint8_t data[] = {
+      0xf0, 0x00, 0x01, 0x02, 0x03, 0xf7, 0x90, 0x44, 0x33,
+  };
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x24 0xf0 0x00 0x01 "
@@ -208,36 +244,48 @@ TEST_F(UsbMidiOutputStreamTest, SendNoteOnAfterSysEx) {
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendTimeCodeQuarterFrame) {
-  uint8 data[] = { 0xf1, 0x22, };
+  uint8_t data[] = {
+      0xf1, 0x22,
+  };
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x22 0xf1 0x22 0x00 (endpoint = 4)\n", device_.log());
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendSongPositionPointer) {
-  uint8 data[] = { 0xf2, 0x22, 0x33, };
+  uint8_t data[] = {
+      0xf2, 0x22, 0x33,
+  };
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x23 0xf2 0x22 0x33 (endpoint = 4)\n", device_.log());
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendSongSelect) {
-  uint8 data[] = { 0xf3, 0x22, };
+  uint8_t data[] = {
+      0xf3, 0x22,
+  };
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x22 0xf3 0x22 0x00 (endpoint = 4)\n", device_.log());
 }
 
 TEST_F(UsbMidiOutputStreamTest, TuneRequest) {
-  uint8 data[] = { 0xf6, };
+  uint8_t data[] = {
+      0xf6,
+  };
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x25 0xf6 0x00 0x00 (endpoint = 4)\n", device_.log());
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendSongPositionPointerPending) {
-  uint8 data1[] = { 0xf2, 0x22, };
-  uint8 data2[] = { 0x33, };
+  uint8_t data1[] = {
+      0xf2, 0x22,
+  };
+  uint8_t data2[] = {
+      0x33,
+  };
 
   stream_->Send(ToVector(data1));
   EXPECT_EQ("", device_.log());
@@ -247,7 +295,9 @@ TEST_F(UsbMidiOutputStreamTest, SendSongPositionPointerPending) {
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendRealTimeMessages) {
-  uint8 data[] = { 0xf8, 0xfa, 0xfb, 0xfc, 0xfe, 0xff, };
+  uint8_t data[] = {
+      0xf8, 0xfa, 0xfb, 0xfc, 0xfe, 0xff,
+  };
 
   stream_->Send(ToVector(data));
   EXPECT_EQ("0x25 0xf8 0x00 0x00 "
@@ -259,10 +309,8 @@ TEST_F(UsbMidiOutputStreamTest, SendRealTimeMessages) {
 }
 
 TEST_F(UsbMidiOutputStreamTest, SendRealTimeInSysExMessage) {
-  uint8 data[] = {
-    0xf0, 0x00, 0x01, 0x02,
-    0xf8, 0xfa,
-    0x03, 0xf7,
+  uint8_t data[] = {
+      0xf0, 0x00, 0x01, 0x02, 0xf8, 0xfa, 0x03, 0xf7,
   };
 
   stream_->Send(ToVector(data));