Reland of Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame.

webrtc/examples/peerconnection/client/main_wnd.h

 /*
  *  Copyright 2012 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_EXAMPLES_PEERCONNECTION_CLIENT_MAIN_WND_H_
 #define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_MAIN_WND_H_
 #pragma once
 
 #include <map>
 #include <memory>
 #include <string>
 
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/base/win32.h"
 #include "webrtc/examples/peerconnection/client/peer_connection_client.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/videocommon.h"
-#include "webrtc/media/base/videoframe.h"
+#include "webrtc/video_frame.h"
 
 class MainWndCallback {
  public:
   virtual void StartLogin(const std::string& server, int port) = 0;
   virtual void DisconnectFromServer() = 0;
   virtual void ConnectToPeer(int peer_id) = 0;
   virtual void DisconnectFromCurrentPeer() = 0;
   virtual void UIThreadCallback(int msg_id, void* data) = 0;
   virtual void Close() = 0;
  protected:
@@ skipping 60 matching lines @@
 
   virtual void StartLocalRenderer(webrtc::VideoTrackInterface* local_video);
   virtual void StopLocalRenderer();
   virtual void StartRemoteRenderer(webrtc::VideoTrackInterface* remote_video);
   virtual void StopRemoteRenderer();
 
   virtual void QueueUIThreadCallback(int msg_id, void* data);
 
   HWND handle() const { return wnd_; }
 
-  class VideoRenderer : public rtc::VideoSinkInterface<cricket::VideoFrame> {
+  class VideoRenderer : public rtc::VideoSinkInterface<webrtc::VideoFrame> {
    public:
     VideoRenderer(HWND wnd, int width, int height,
                   webrtc::VideoTrackInterface* track_to_render);
     virtual ~VideoRenderer();
 
     void Lock() {
       ::EnterCriticalSection(&buffer_lock_);
     }
 
     void Unlock() {
       ::LeaveCriticalSection(&buffer_lock_);
     }
 
     // VideoSinkInterface implementation
-    void OnFrame(const cricket::VideoFrame& frame) override;
+    void OnFrame(const webrtc::VideoFrame& frame) override;
 
     const BITMAPINFO& bmi() const { return bmi_; }
     const uint8_t* image() const { return image_.get(); }
 
    protected:
     void SetSize(int width, int height);
 
     enum {
       SET_SIZE,
       RENDER_FRAME,
@@ skipping 62 matching lines @@
   MainWndCallback* callback_;
   static ATOM wnd_class_;
   std::string server_;
   std::string port_;
   bool auto_connect_;
   bool auto_call_;
 };
 #endif  // WIN32
 
 #endif  // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_MAIN_WND_H_