From 97b7d5fe0be29e8565056b028ca0fe0556efca67 Mon Sep 17 00:00:00 2001 From: henrikg Date: Mon, 16 Jan 2017 00:12:52 -0800 Subject: [PATCH] Revert of Remove the IceTransportInternal2. (patchset #1 id:1 of https://codereview.webrtc.org/2632563002/ ) Reason for revert: Broke Chromium FYI bots. See for example https://build.chromium.org/p/chromium.webrtc.fyi/builders/Win%20Builder/builds/8631 FAILED: obj/remoting/protocol/protocol/ice_transport_channel.obj ninja -t msvc -e environment.x86 -- E:\b\c\cipd\goma/gomacc.exe "E:\b\depot_tools\win_toolchain\vs_files\d3cb0e37bdd120ad0ac4650b674b09e81be45616\VC\bin\amd64_x86/cl.exe" /nologo /showIncludes /FC @obj/remoting/protocol/protocol/ice_transport_channel.obj.rsp /c ../../remoting/protocol/ice_transport_channel.cc /Foobj/remoting/protocol/protocol/ice_transport_channel.obj /Fd"obj/remoting/protocol/protocol_cc.pdb" e:\b\c\b\win_builder\src\remoting\protocol\ice_transport_channel.cc(186): error C2039: 'IceTransportInternal2': is not a member of 'cricket' e:\b\c\b\win_builder\src\third_party\webrtc\p2p\base\p2ptransportchannel.h(38): note: see declaration of 'cricket' e:\b\c\b\win_builder\src\remoting\protocol\ice_transport_channel.cc(186): error C2065: 'IceTransportInternal2': undeclared identifier e:\b\c\b\win_builder\src\remoting\protocol\ice_transport_channel.cc(186): error C2065: 'ice_transport': undeclared identifier e:\b\c\b\win_builder\src\remoting\protocol\ice_transport_channel.cc(187): error C2059: syntax error: 'const' e:\b\c\b\win_builder\src\remoting\protocol\ice_transport_channel.cc(187): error C2143: syntax error: missing ';' before '{' e:\b\c\b\win_builder\src\remoting\protocol\ice_transport_channel.cc(187): error C2447: '{': missing function header (old-style formal list?) Original issue's description: > Remove the IceTransportInternal2. > > Introduing IceTransportInternal2 is a temporary fix to switch the base > class of P2PTransportChannel to IceTransportInternal without breaking > Chromium. It is removed in this CL. > > BUG=webrtc:6951 > > Review-Url: https://codereview.webrtc.org/2632563002 > Cr-Commit-Position: refs/heads/master@{#16083} > Committed: https://chromium.googlesource.com/external/webrtc/+/8aaa51190e043e12b7a9acb28ff730e575d651ae TBR=deadbeef@webrtc.org,zhihuang@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6951 Review-Url: https://codereview.webrtc.org/2630243002 Cr-Commit-Position: refs/heads/master@{#16086} --- webrtc/p2p/base/icetransportinternal.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webrtc/p2p/base/icetransportinternal.h b/webrtc/p2p/base/icetransportinternal.h index 05939629f8..bd3c78a770 100644 --- a/webrtc/p2p/base/icetransportinternal.h +++ b/webrtc/p2p/base/icetransportinternal.h @@ -25,6 +25,9 @@ class MetricsObserverInterface; namespace cricket { +class IceTransportInternal; +typedef IceTransportInternal IceTransportInternal2; + // TODO(zhihuang): replace it with PeerConnectionInterface::IceConnectionState. enum class IceTransportState { STATE_INIT,