Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / content / renderer / media / mock_peer_connection_impl.cc

diff --git a/src/content/renderer/media/mock_peer_connection_impl.cc b/src/content/renderer/media/mock_peer_connection_impl.cc
index 41fa2d1..831571b 100644 (file)
--- a/src/content/renderer/media/mock_peer_connection_impl.cc
+++ b/src/content/renderer/media/mock_peer_connection_impl.cc
@@ -75,7 +75,7 @@ class MockStreamCollection : public webrtc::StreamCollectionInterface {
   virtual ~MockStreamCollection() {}
 
  private:
-  typedef std::vector<talk_base::scoped_refptr<MediaStreamInterface> >
+  typedef std::vector<rtc::scoped_refptr<MediaStreamInterface> >
       StreamVector;
   StreamVector streams_;
 };
@@ -194,7 +194,7 @@ class MockDtmfSender : public DtmfSenderInterface {
   virtual ~MockDtmfSender() {}
 
  private:
-  talk_base::scoped_refptr<AudioTrackInterface> track_;
+  rtc::scoped_refptr<AudioTrackInterface> track_;
   DtmfSenderObserverInterface* observer_;
   std::string tones_;
   int duration_;
@@ -207,8 +207,8 @@ const char MockPeerConnectionImpl::kDummyAnswer[] = "dummy answer";
 MockPeerConnectionImpl::MockPeerConnectionImpl(
     MockPeerConnectionDependencyFactory* factory)
     : dependency_factory_(factory),
-      local_streams_(new talk_base::RefCountedObject<MockStreamCollection>),
-      remote_streams_(new talk_base::RefCountedObject<MockStreamCollection>),
+      local_streams_(new rtc::RefCountedObject<MockStreamCollection>),
+      remote_streams_(new rtc::RefCountedObject<MockStreamCollection>),
       hint_audio_(false),
       hint_video_(false),
       getstats_result_(true),
@@ -221,12 +221,12 @@ MockPeerConnectionImpl::MockPeerConnectionImpl(
 
 MockPeerConnectionImpl::~MockPeerConnectionImpl() {}
 
-talk_base::scoped_refptr<webrtc::StreamCollectionInterface>
+rtc::scoped_refptr<webrtc::StreamCollectionInterface>
 MockPeerConnectionImpl::local_streams() {
   return local_streams_;
 }
 
-talk_base::scoped_refptr<webrtc::StreamCollectionInterface>
+rtc::scoped_refptr<webrtc::StreamCollectionInterface>
 MockPeerConnectionImpl::remote_streams() {
   return remote_streams_;
 }
@@ -247,18 +247,18 @@ void MockPeerConnectionImpl::RemoveStream(
   local_streams_->RemoveStream(local_stream);
 }
 
-talk_base::scoped_refptr<DtmfSenderInterface>
+rtc::scoped_refptr<DtmfSenderInterface>
 MockPeerConnectionImpl::CreateDtmfSender(AudioTrackInterface* track) {
   if (!track) {
     return NULL;
   }
-  return new talk_base::RefCountedObject<MockDtmfSender>(track);
+  return new rtc::RefCountedObject<MockDtmfSender>(track);
 }
 
-talk_base::scoped_refptr<webrtc::DataChannelInterface>
+rtc::scoped_refptr<webrtc::DataChannelInterface>
 MockPeerConnectionImpl::CreateDataChannel(const std::string& label,
                       const webrtc::DataChannelInit* config) {
-  return new talk_base::RefCountedObject<MockDataChannel>(label, config);
+  return new rtc::RefCountedObject<MockDataChannel>(label, config);
 }
 
 bool MockPeerConnectionImpl::GetStats(
@@ -269,30 +269,35 @@ bool MockPeerConnectionImpl::GetStats(
     return false;
 
   DCHECK_EQ(kStatsOutputLevelStandard, level);
-  std::vector<webrtc::StatsReport> reports(track ? 1 : 2);
-  webrtc::StatsReport& report = reports[0];
-  report.id = "1234";
-  report.type = "ssrc";
-  report.timestamp = 42;
-  webrtc::StatsReport::Value value;
-  value.name = "trackname";
-  value.value = "trackvalue";
-  report.values.push_back(value);
+  webrtc::StatsReport report1, report2;
+  report1.id = "1234";
+  report1.type = "ssrc";
+  report1.timestamp = 42;
+  report1.values.push_back(
+      webrtc::StatsReport::Value(
+          webrtc::StatsReport::kStatsValueNameFingerprint,
+          "trackvalue"));
+
+  std::vector<webrtc::StatsReport> reports;
+  reports.push_back(report1);
+
   // If selector is given, we pass back one report.
   // If selector is not given, we pass back two.
   if (!track) {
-    webrtc::StatsReport& report2 = reports[1];
     report2.id = "nontrack";
     report2.type = "generic";
     report2.timestamp = 44;
-    report2.values.push_back(value);
-    value.name = "somename";
-    value.value = "somevalue";
-    report2.values.push_back(value);
+    report2.values.push_back(
+        webrtc::StatsReport::Value(
+            webrtc::StatsReport::kStatsValueNameFingerprintAlgorithm,
+            "somevalue"));
+    reports.push_back(report2);
   }
+
   // Note that the callback is synchronous, not asynchronous; it will
   // happen before the request call completes.
   observer->OnComplete(reports);
+
   return true;
 }