NetEq: Change member variables for current RTP types to rtc::Optionals

webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc

Index: webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc b/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc
index 73dbd6203f81f48d7451afe9a8d08cdc997419ec..4e02e9cf6c1c4e8b808a1949b695e21debe4af38 100644
--- a/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc
@@ -174,16 +174,16 @@ TEST(PacketBuffer, InsertPacketList) {
   }
 
   MockDecoderDatabase decoder_database;
-  uint8_t current_pt = 0xFF;
-  uint8_t current_cng_pt = 0xFF;
+  rtc::Optional<uint8_t> current_pt;
+  rtc::Optional<uint8_t> current_cng_pt;
   EXPECT_EQ(PacketBuffer::kOK, buffer.InsertPacketList(&list,
                                                        decoder_database,
                                                        &current_pt,
                                                        &current_cng_pt));
   EXPECT_TRUE(list.empty());  // The PacketBuffer should have depleted the list.
   EXPECT_EQ(10u, buffer.NumPacketsInBuffer());
-  EXPECT_EQ(0, current_pt);  // Current payload type changed to 0.
-  EXPECT_EQ(0xFF, current_cng_pt);  // CNG payload type not changed.
+  EXPECT_EQ(0, current_pt.value_or(-1));  // Current payload type changed to 0.

[kwiberg-webrtc, 2016/08/30 10:29:32]

Or

  EXPECT_EQ(rtc::Optional<uint8_t>(0), current_pt);

[hlundin-webrtc, 2016/08/30 10:53:16]

Done.

+  EXPECT_FALSE(current_cng_pt);           // CNG payload type not changed.
 
   buffer.Flush();  // Clean up.
 
@@ -212,16 +212,16 @@ TEST(PacketBuffer, InsertPacketListChangePayloadType) {
 
 
   MockDecoderDatabase decoder_database;
-  uint8_t current_pt = 0xFF;
-  uint8_t current_cng_pt = 0xFF;
+  rtc::Optional<uint8_t> current_pt;
+  rtc::Optional<uint8_t> current_cng_pt;
   EXPECT_EQ(PacketBuffer::kFlushed, buffer.InsertPacketList(&list,
                                                             decoder_database,
                                                             &current_pt,
                                                             &current_cng_pt));
   EXPECT_TRUE(list.empty());  // The PacketBuffer should have depleted the list.
   EXPECT_EQ(1u, buffer.NumPacketsInBuffer());  // Only the last packet.
-  EXPECT_EQ(1, current_pt);  // Current payload type changed to 0.
-  EXPECT_EQ(0xFF, current_cng_pt);  // CNG payload type not changed.
+  EXPECT_EQ(1, current_pt.value_or(-1));  // Current payload type changed to 0.
+  EXPECT_FALSE(current_cng_pt);           // CNG payload type not changed.
 
   buffer.Flush();  // Clean up.
 
@@ -341,8 +341,8 @@ TEST(PacketBuffer, Reordering) {
   }
 
   MockDecoderDatabase decoder_database;
-  uint8_t current_pt = 0xFF;
-  uint8_t current_cng_pt = 0xFF;
+  rtc::Optional<uint8_t> current_pt;
+  rtc::Optional<uint8_t> current_cng_pt;
 
   EXPECT_EQ(PacketBuffer::kOK, buffer.InsertPacketList(&list,
                                                        decoder_database,
@@ -412,8 +412,8 @@ TEST(PacketBuffer, Failures) {
   list.push_back(packet);
   list.push_back(gen.NextPacket(payload_len));  // Valid packet.
   MockDecoderDatabase decoder_database;
-  uint8_t current_pt = 0xFF;
-  uint8_t current_cng_pt = 0xFF;
+  rtc::Optional<uint8_t> current_pt;
+  rtc::Optional<uint8_t> current_cng_pt;
   EXPECT_EQ(PacketBuffer::kInvalidPacket,
             buffer->InsertPacketList(&list,
                                      decoder_database,