Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / app / webrtc / mediaconstraintsinterface.cc

diff --git a/src/third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface.cc b/src/third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface.cc
index 0ecadd6..74f6542 100644 (file)
--- a/src/third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface.cc
+++ b/src/third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface.cc
@@ -27,7 +27,7 @@
 
 #include "talk/app/webrtc/mediaconstraintsinterface.h"
 
-#include "talk/base/stringencode.h"
+#include "webrtc/base/stringencode.h"
 
 namespace webrtc {
 
@@ -95,10 +95,10 @@ const char MediaConstraintsInterface::kEnableVideoSuspendBelowMinBitrate[] =
     "googSuspendBelowMinBitrate";
 const char MediaConstraintsInterface::kImprovedWifiBwe[] =
     "googImprovedWifiBwe";
+const char MediaConstraintsInterface::kNumUnsignalledRecvStreams[] =
+    "googNumUnsignalledRecvStreams";
 const char MediaConstraintsInterface::kScreencastMinBitrate[] =
     "googScreencastMinBitrate";
-const char MediaConstraintsInterface::kSkipEncodingUnusedStreams[] =
-    "googSkipEncodingUnusedStreams";
 // TODO(ronghuawu): Remove once cpu overuse detection is stable.
 const char MediaConstraintsInterface::kCpuOveruseDetection[] =
     "googCpuOveruseDetection";
@@ -155,10 +155,10 @@ bool FindConstraint(const MediaConstraintsInterface* constraints,
   if (constraints->GetMandatory().FindFirst(key, &string_value)) {
     if (mandatory_constraints)
       ++*mandatory_constraints;
-    return talk_base::FromString(string_value, value);
+    return rtc::FromString(string_value, value);
   }
   if (constraints->GetOptional().FindFirst(key, &string_value)) {
-    return talk_base::FromString(string_value, value);
+    return rtc::FromString(string_value, value);
   }
   return false;
 }