Revert of Delete deprecated and transitional stuff related to video frame refactoring.

webrtc/api/mediastreaminterface.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.
  */
 
 // This file contains interfaces for MediaStream, MediaTrack and MediaSource.
 // These interfaces are used for implementing MediaStream and MediaTrack as
 // defined in http://dev.w3.org/2011/webrtc/editor/webrtc.html#stream-api. These
 // interfaces must be used only with PeerConnection. PeerConnectionManager
 // interface provides the factory methods to create MediaStream and MediaTracks.
 
 #ifndef WEBRTC_API_MEDIASTREAMINTERFACE_H_
 #define WEBRTC_API_MEDIASTREAMINTERFACE_H_
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
 
 #include "webrtc/api/video/video_frame.h"
+// TODO(nisse): Transition hack, Chrome expects that including this
+// file declares I420Buffer. Delete after users of I420Buffer are
+// fixed to include the new header.
+#include "webrtc/api/video/i420_buffer.h"
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/optional.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/videosinkinterface.h"
 #include "webrtc/media/base/videosourceinterface.h"
 
 namespace webrtc {
 
 // Generic observer interface.
@@ skipping 261 matching lines @@
   virtual bool RemoveTrack(AudioTrackInterface* track) = 0;
   virtual bool RemoveTrack(VideoTrackInterface* track) = 0;
 
  protected:
   virtual ~MediaStreamInterface() {}
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_MEDIASTREAMINTERFACE_H_