Merge webrtc/video_engine/ into webrtc/video/

webrtc/test/win/d3d_renderer.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_WIN_D3D_RENDERER_H_
-#define WEBRTC_VIDEO_ENGINE_TEST_COMMON_WIN_D3D_RENDERER_H_
+#ifndef WEBRTC_TEST_WIN_D3D_RENDERER_H_
+#define WEBRTC_TEST_WIN_D3D_RENDERER_H_
 
 #include <Windows.h>
 #include <d3d9.h>
 #pragma comment(lib, "d3d9.lib")       // located in DirectX SDK
 
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/test/video_renderer.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ skipping 22 matching lines @@
   HWND hwnd_;
   rtc::scoped_refptr<IDirect3D9> d3d_;
   rtc::scoped_refptr<IDirect3DDevice9> d3d_device_;
 
   rtc::scoped_refptr<IDirect3DTexture9> texture_;
   rtc::scoped_refptr<IDirect3DVertexBuffer9> vertex_buffer_;
 };
 }  // namespace test
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_TEST_COMMON_WIN_D3D_RENDERER_H_
+#endif  // WEBRTC_TEST_WIN_D3D_RENDERER_H_