Index: webrtc/media/base/mediachannel.h |
diff --git a/webrtc/media/base/mediachannel.h b/webrtc/media/base/mediachannel.h |
index 1206cccbea527c5af2b9aa5c186e1a3a5f1834fb..354b6e4601d43b182c20ceb6992c0dbb6eb6ea8e 100644 |
--- a/webrtc/media/base/mediachannel.h |
+++ b/webrtc/media/base/mediachannel.h |
@@ -11,7 +11,6 @@ |
#ifndef WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ |
#define WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ |
-#include <algorithm> |
#include <memory> |
#include <string> |
#include <vector> |
@@ -81,17 +80,6 @@ static std::string VectorToString(const std::vector<T>& vals) { |
return ost.str(); |
} |
-template <typename T> |
-static T MinPositive(T a, T b) { |
- if (a <= 0) { |
- return b; |
- } |
- if (b <= 0) { |
- return a; |
- } |
- return std::min(a, b); |
-} |
- |
// Construction-time settings, passed on when creating |
// MediaChannels. |
struct MediaConfig { |