From b429e516a98d2dee0c57d3263f6d21633939b564 Mon Sep 17 00:00:00 2001
From: "mflodman@webrtc.org"
 <mflodman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Wed, 18 Dec 2013 09:46:22 +0000
Subject: [PATCH] cpplint cleaning new API and its implementation files.

R=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/6089005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5317 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 webrtc/call.h                        | 6 +++---
 webrtc/video/video_receive_stream.cc | 2 ++
 webrtc/video_receive_stream.h        | 6 +++---
 webrtc/video_send_stream.h           | 6 +++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/webrtc/call.h b/webrtc/call.h
index 7ee2592452..febb8f3bbf 100644
--- a/webrtc/call.h
+++ b/webrtc/call.h
@@ -7,8 +7,8 @@
  *  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_NEW_INCLUDE_CALL_H_
-#define WEBRTC_VIDEO_ENGINE_NEW_INCLUDE_CALL_H_
+#ifndef WEBRTC_CALL_H_
+#define WEBRTC_CALL_H_
 
 #include <string>
 #include <vector>
@@ -98,4 +98,4 @@ class Call {
 };
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_NEW_INCLUDE_CALL_H_
+#endif  // WEBRTC_CALL_H_
diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc
index 8d4dfd6487..747ab8f219 100644
--- a/webrtc/video/video_receive_stream.cc
+++ b/webrtc/video/video_receive_stream.cc
@@ -13,6 +13,8 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <string>
+
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/system_wrappers/interface/clock.h"
 #include "webrtc/video_engine/include/vie_base.h"
diff --git a/webrtc/video_receive_stream.h b/webrtc/video_receive_stream.h
index e54872812e..c6669b9d33 100644
--- a/webrtc/video_receive_stream.h
+++ b/webrtc/video_receive_stream.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_NEW_INCLUDE_VIDEO_RECEIVE_STREAM_H_
-#define WEBRTC_VIDEO_ENGINE_NEW_INCLUDE_VIDEO_RECEIVE_STREAM_H_
+#ifndef WEBRTC_VIDEO_RECEIVE_STREAM_H_
+#define WEBRTC_VIDEO_RECEIVE_STREAM_H_
 
 #include <string>
 #include <vector>
@@ -184,4 +184,4 @@ class VideoReceiveStream {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_NEW_INCLUDE_VIDEO_RECEIVE_STREAM_H_
+#endif  // WEBRTC_VIDEO_RECEIVE_STREAM_H_
diff --git a/webrtc/video_send_stream.h b/webrtc/video_send_stream.h
index 9d4695dfe7..7c1a6fd029 100644
--- a/webrtc/video_send_stream.h
+++ b/webrtc/video_send_stream.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_NEW_INCLUDE_VIDEO_SEND_STREAM_H_
-#define WEBRTC_VIDEO_ENGINE_NEW_INCLUDE_VIDEO_SEND_STREAM_H_
+#ifndef WEBRTC_VIDEO_SEND_STREAM_H_
+#define WEBRTC_VIDEO_SEND_STREAM_H_
 
 #include <string>
 #include <vector>
@@ -167,4 +167,4 @@ class VideoSendStream {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_NEW_INCLUDE_VIDEO_SEND_STREAM_H_
+#endif  // WEBRTC_VIDEO_SEND_STREAM_H_