Unify Transport and newapi::Transport interfaces.

webrtc/test/rtp_rtcp_observer.h

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #ifndef WEBRTC_VIDEO_ENGINE_TEST_COMMON_RTP_RTCP_OBSERVER_H_
 #define WEBRTC_VIDEO_ENGINE_TEST_COMMON_RTP_RTCP_OBSERVER_H_
 
 #include <map>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"
 #include "webrtc/test/direct_transport.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/video_send_stream.h"
 
 namespace webrtc {
 namespace test {
 
 class RtpRtcpObserver {
  public:
   virtual ~RtpRtcpObserver() {}
-  newapi::Transport* SendTransport() {
+  Transport* SendTransport() {
     return &send_transport_;
   }
 
-  newapi::Transport* ReceiveTransport() {
+  Transport* ReceiveTransport() {
     return &receive_transport_;
   }
 
   virtual void SetReceivers(PacketReceiver* send_transport_receiver,
                             PacketReceiver* receive_transport_receiver) {
     send_transport_.SetReceiver(send_transport_receiver);
     receive_transport_.SetReceiver(receive_transport_receiver);
   }
 
   void StopSending() {
@@ skipping 128 matching lines @@
   const rtc::scoped_ptr<RtpHeaderParser> parser_;
   PacketTransport send_transport_, receive_transport_;
 
  private:
   unsigned int timeout_ms_;
 };
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_ENGINE_TEST_COMMON_RTP_RTCP_OBSERVER_H_