Support GCM ciphers even if ENABLE_EXTERNAL_AUTH is defined.

webrtc/p2p/base/fakeicetransport.h

Index: webrtc/p2p/base/fakeicetransport.h
diff --git a/webrtc/p2p/base/fakeicetransport.h b/webrtc/p2p/base/fakeicetransport.h
index 2b0662f8561cde3f69fd713f8ae0ea44f26debec..788a048732ccacce26d9a2a8475fc2e24afd9fee 100644
--- a/webrtc/p2p/base/fakeicetransport.h
+++ b/webrtc/p2p/base/fakeicetransport.h
@@ -15,6 +15,7 @@
 
 #include "webrtc/base/asyncinvoker.h"
 #include "webrtc/base/copyonwritebuffer.h"
+#include "webrtc/media/base/rtputils.h"

[joachim, 2017/02/28 00:11:45]

This dependency is invalid ("media" depends on "p2p", so we can't depend the
other way around).

What is the best practice to implement this? Should I create a different CL to
move "rtputils*" to "/base" first?

[joachim, 2017/02/28 13:09:32]

That should have been "p2p/base", not "/base".

[Taylor Brandstetter, 2017/02/28 22:53:40]

I don't quite understand why this dependency is needed; could you explain? Why
does the fake transport need to handle external auth?

 #include "webrtc/p2p/base/icetransportinternal.h"
 
 namespace cricket {
@@ -172,10 +173,11 @@ class FakeIceTransport : public IceTransportInternal {
     if (async_) {
       invoker_.AsyncInvokeDelayed<void>(
           RTC_FROM_HERE, rtc::Thread::Current(),
-          rtc::Bind(&FakeIceTransport::SendPacketInternal, this, packet),
+          rtc::Bind(&FakeIceTransport::SendPacketInternal, this, packet,
+              options),
           async_delay_ms_);
     } else {
-      SendPacketInternal(packet);
+      SendPacketInternal(packet, options);
     }
     rtc::SentPacket sent_packet(options.packet_id, rtc::TimeMillis());
     SignalSentPacket(this, sent_packet);
@@ -206,9 +208,14 @@ class FakeIceTransport : public IceTransportInternal {
     SignalReceivingState(this);
   }
 
-  void SendPacketInternal(const rtc::CopyOnWriteBuffer& packet) {
+  void SendPacketInternal(const rtc::CopyOnWriteBuffer& packet,
+      const rtc::PacketOptions& options) {
     if (dest_) {
-      dest_->SignalReadPacket(dest_, packet.data<char>(), packet.size(),
+      rtc::CopyOnWriteBuffer data(packet);
+      cricket::ApplyPacketOptions(
+          reinterpret_cast<uint8_t*>(data.data<char>()), data.size(),
+          options.packet_time_params, 0);
+      dest_->SignalReadPacket(dest_, data.data<char>(), data.size(),
                               rtc::CreatePacketTime(0), 0);
     }
   }