Prepare to introduce the IceTransportInternal.

Prepare to introduce the IceTransportInternal.

The P2PTransportChannel will eventually inherit from IceTransportInternal instead of TransportChannelImpl.
However, the Chromium/remoting depends on TransportChannel and TransportChannelImpl.

The solution to work around this:
Step1:
  Make a WebRTC CL to introduce IceTransportInternal and IceTransportInternal2 by type-defining
  TransportChannel and TransportChannelImpl.
Step2:
  Make a Chromium CL to replace the TransportChannel and TransportChannelImpl with
  IceTransportInternal and IceTransportInternal2.
Step3:
  Make a WebRTC to redefine IceTransportInternal2 to be IceTransportInternal and switch the base
  class of P2PTransportChannel with IceTransportInternal.
Step4"
  Make a Chromium CL to remove the IceTransportInternal2.

This CL is the Step1. The real IceTransportInternal implementation
is commented out temporarily.

BUG=none

Review-Url: https://codereview.webrtc.org/2598103003
Cr-Commit-Position: refs/heads/master@{#15824}
Committed: https://chromium.googlesource.com/external/webrtc/+/655f7cf355365643e3242d806116a79a3b8f90da

[Zhi Huang, 2016-12-23 00:47:31]

Description was changed from

==========
Prepare to introduce the IceTransportInternal.

The P2PTransportChannel will eventually inherit from IceTransportInternal
instead of TransportChannelImpl.
However, the Chromium/remoting depends on TransportChannel and
TransportChannelImpl.

The solution is work around this:
Step1:
  Make a WebRTC CL to introduce IceTransportInternal and IceTransportInternal2
by type-defining
  TransportChannel and TransportChannelImpl.
Step2:
  Make a Chromium CL to replace the TransportChannel and TransportChannelImpl
with
  IceTransportInternal and IceTransportInternal2.
Step3:
  Make a WebRTC to redefine IceTransportInternal2 to be IceTransportInternal and
switch the base
  class of P2PTransportChannel with IceTransportInternal.
Step4"
  Make a Chromium CL to remove the IceTransportInternal2.

BUG=none
==========

to

==========
Prepare to introduce the IceTransportInternal.

The P2PTransportChannel will eventually inherit from IceTransportInternal
instead of TransportChannelImpl.
However, the Chromium/remoting depends on TransportChannel and
TransportChannelImpl.

The solution to work around this:
Step1:
  Make a WebRTC CL to introduce IceTransportInternal and IceTransportInternal2
by type-defining
  TransportChannel and TransportChannelImpl.
Step2:
  Make a Chromium CL to replace the TransportChannel and TransportChannelImpl
with
  IceTransportInternal and IceTransportInternal2.
Step3:
  Make a WebRTC to redefine IceTransportInternal2 to be IceTransportInternal and
switch the base
  class of P2PTransportChannel with IceTransportInternal.
Step4"
  Make a Chromium CL to remove the IceTransportInternal2.

This CL is the Step1.

BUG=none
==========

[Taylor Brandstetter, 2016-12-23 07:12:51]

deadbeef@webrtc.org changed reviewers:
+ deadbeef@webrtc.org

[Taylor Brandstetter, 2016-12-23 07:12:52]

https://codereview.webrtc.org/2598103003/diff/1/webrtc/p2p/base/icetransporti...
File webrtc/p2p/base/icetransportinternal.h (left):

https://codereview.webrtc.org/2598103003/diff/1/webrtc/p2p/base/icetransporti...
webrtc/p2p/base/icetransportinternal.h:33: };
Again, I'd suggest leaving this code, but commented out (/* ... */). That will
make the diffs clearer later.

https://codereview.webrtc.org/2598103003/diff/1/webrtc/p2p/base/icetransporti...
File webrtc/p2p/base/icetransportinternal.h (right):

https://codereview.webrtc.org/2598103003/diff/1/webrtc/p2p/base/icetransporti...
webrtc/p2p/base/icetransportinternal.h:14: #include
"webrtc/p2p/base/transportchannel.h"
Does this need to include transportchannelimpl.h?

[Zhi Huang, 2016-12-27 19:05:49]

Description was changed from

==========
Prepare to introduce the IceTransportInternal.

The P2PTransportChannel will eventually inherit from IceTransportInternal
instead of TransportChannelImpl.
However, the Chromium/remoting depends on TransportChannel and
TransportChannelImpl.

The solution to work around this:
Step1:
  Make a WebRTC CL to introduce IceTransportInternal and IceTransportInternal2
by type-defining
  TransportChannel and TransportChannelImpl.
Step2:
  Make a Chromium CL to replace the TransportChannel and TransportChannelImpl
with
  IceTransportInternal and IceTransportInternal2.
Step3:
  Make a WebRTC to redefine IceTransportInternal2 to be IceTransportInternal and
switch the base
  class of P2PTransportChannel with IceTransportInternal.
Step4"
  Make a Chromium CL to remove the IceTransportInternal2.

This CL is the Step1.

BUG=none
==========

to

==========
Prepare to introduce the IceTransportInternal.

The P2PTransportChannel will eventually inherit from IceTransportInternal
instead of TransportChannelImpl.
However, the Chromium/remoting depends on TransportChannel and
TransportChannelImpl.

The solution to work around this:
Step1:
  Make a WebRTC CL to introduce IceTransportInternal and IceTransportInternal2
by type-defining
  TransportChannel and TransportChannelImpl.
Step2:
  Make a Chromium CL to replace the TransportChannel and TransportChannelImpl
with
  IceTransportInternal and IceTransportInternal2.
Step3:
  Make a WebRTC to redefine IceTransportInternal2 to be IceTransportInternal and
switch the base
  class of P2PTransportChannel with IceTransportInternal.
Step4"
  Make a Chromium CL to remove the IceTransportInternal2.

This CL is the Step1. The real IceTransportInternal implementation
is commented out temporarily.

BUG=none
==========

[Zhi Huang, 2016-12-27 19:10:15]

Please take another look.

https://codereview.webrtc.org/2598103003/diff/1/webrtc/p2p/base/icetransporti...
File webrtc/p2p/base/icetransportinternal.h (left):

https://codereview.webrtc.org/2598103003/diff/1/webrtc/p2p/base/icetransporti...
webrtc/p2p/base/icetransportinternal.h:33: };
On 2016/12/23 07:12:51, Taylor Brandstetter (OOO) wrote:
> Again, I'd suggest leaving this code, but commented out (/* ... */). That will
> make the diffs clearer later.

Done.

https://codereview.webrtc.org/2598103003/diff/1/webrtc/p2p/base/icetransporti...
File webrtc/p2p/base/icetransportinternal.h (right):

https://codereview.webrtc.org/2598103003/diff/1/webrtc/p2p/base/icetransporti...
webrtc/p2p/base/icetransportinternal.h:14: #include
"webrtc/p2p/base/transportchannel.h"
On 2016/12/23 07:12:51, Taylor Brandstetter (OOO) wrote:
> Does this need to include transportchannelimpl.h?

I only included the transportchannelimpl.h since TransportChannel is the base
class.

[Taylor Brandstetter, 2016-12-28 19:34:37]

lgtm

[Zhi Huang, 2016-12-28 20:40:45]

The CQ bit was checked by zhihuang@webrtc.org

[commit-bot: I haz the power, 2016-12-28 20:40:50]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2016-12-28 21:55:03]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1482957645679980,
"parent_rev": "66653b60af33f03eb650451672fac59c1ec03e1c", "commit_rev":
"655f7cf355365643e3242d806116a79a3b8f90da"}

[commit-bot: I haz the power, 2016-12-28 21:55:05]

Description was changed from

==========
Prepare to introduce the IceTransportInternal.

The P2PTransportChannel will eventually inherit from IceTransportInternal
instead of TransportChannelImpl.
However, the Chromium/remoting depends on TransportChannel and
TransportChannelImpl.

The solution to work around this:
Step1:
  Make a WebRTC CL to introduce IceTransportInternal and IceTransportInternal2
by type-defining
  TransportChannel and TransportChannelImpl.
Step2:
  Make a Chromium CL to replace the TransportChannel and TransportChannelImpl
with
  IceTransportInternal and IceTransportInternal2.
Step3:
  Make a WebRTC to redefine IceTransportInternal2 to be IceTransportInternal and
switch the base
  class of P2PTransportChannel with IceTransportInternal.
Step4"
  Make a Chromium CL to remove the IceTransportInternal2.

This CL is the Step1. The real IceTransportInternal implementation
is commented out temporarily.

BUG=none
==========

to

==========
Prepare to introduce the IceTransportInternal.

The P2PTransportChannel will eventually inherit from IceTransportInternal
instead of TransportChannelImpl.
However, the Chromium/remoting depends on TransportChannel and
TransportChannelImpl.

The solution to work around this:
Step1:
  Make a WebRTC CL to introduce IceTransportInternal and IceTransportInternal2
by type-defining
  TransportChannel and TransportChannelImpl.
Step2:
  Make a Chromium CL to replace the TransportChannel and TransportChannelImpl
with
  IceTransportInternal and IceTransportInternal2.
Step3:
  Make a WebRTC to redefine IceTransportInternal2 to be IceTransportInternal and
switch the base
  class of P2PTransportChannel with IceTransportInternal.
Step4"
  Make a Chromium CL to remove the IceTransportInternal2.

This CL is the Step1. The real IceTransportInternal implementation
is commented out temporarily.

BUG=none

Review-Url: https://codereview.webrtc.org/2598103003
Cr-Commit-Position: refs/heads/master@{#15824}
Committed:
https://chromium.googlesource.com/external/webrtc/+/655f7cf355365643e3242d806...
==========

[commit-bot: I haz the power, 2016-12-28 21:55:06]

Committed patchset #2 (id:20001) as
https://chromium.googlesource.com/external/webrtc/+/655f7cf355365643e3242d806...