Revert of Merge webrtc/video_engine/ into webrtc/video/

webrtc/video_engine/encoder_state_feedback_unittest.cc

 /*
  *  Copyright (c) 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 includes unit tests for EncoderStateFeedback.
-#include "webrtc/video/encoder_state_feedback.h"
+#include "webrtc/video_engine/encoder_state_feedback.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/common.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 #include "webrtc/modules/pacing/paced_sender.h"
 #include "webrtc/modules/pacing/packet_router.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/utility/include/mock/mock_process_thread.h"
-#include "webrtc/video/payload_router.h"
-#include "webrtc/video/vie_encoder.h"
+#include "webrtc/video_engine/payload_router.h"
+#include "webrtc/video_engine/vie_encoder.h"
 
 using ::testing::NiceMock;
 
 namespace webrtc {
 
 class MockVieEncoder : public ViEEncoder {
  public:
   explicit MockVieEncoder(ProcessThread* process_thread, PacedSender* pacer)
       : ViEEncoder(1, process_thread, nullptr, nullptr, pacer, nullptr) {}
   ~MockVieEncoder() {}
@@ skipping 97 matching lines @@
 
   encoder_state_feedback_->RemoveEncoder(&encoder_1);
   EXPECT_CALL(encoder_2, OnReceivedIntraFrameRequest(ssrc_2))
       .Times(1);
   encoder_state_feedback_->GetRtcpIntraFrameObserver()->
       OnReceivedIntraFrameRequest(ssrc_2);
   encoder_state_feedback_->RemoveEncoder(&encoder_2);
 }
 
 }  // namespace webrtc