Update To 11.40.268.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 d21e134..6df5a32 100644 (file)
--- a/src/content/renderer/media/mock_peer_connection_impl.cc
+++ b/src/content/renderer/media/mock_peer_connection_impl.cc
@@ -25,21 +25,17 @@ namespace content {
 
 class MockStreamCollection : public webrtc::StreamCollectionInterface {
  public:
-  virtual size_t count() OVERRIDE {
-    return streams_.size();
-  }
-  virtual MediaStreamInterface* at(size_t index) OVERRIDE {
-    return streams_[index];
-  }
-  virtual MediaStreamInterface* find(const std::string& label) OVERRIDE {
+  size_t count() override { return streams_.size(); }
+  MediaStreamInterface* at(size_t index) override { return streams_[index]; }
+  MediaStreamInterface* find(const std::string& label) override {
     for (size_t i = 0; i < streams_.size(); ++i) {
       if (streams_[i]->label() == label)
         return streams_[i];
     }
     return NULL;
   }
-  virtual webrtc::MediaStreamTrackInterface* FindAudioTrack(
-      const std::string& id) OVERRIDE {
+  webrtc::MediaStreamTrackInterface* FindAudioTrack(
+      const std::string& id) override {
     for (size_t i = 0; i < streams_.size(); ++i) {
       webrtc::MediaStreamTrackInterface* track =
           streams_.at(i)->FindAudioTrack(id);
@@ -48,8 +44,8 @@ class MockStreamCollection : public webrtc::StreamCollectionInterface {
     }
     return NULL;
   }
-  virtual webrtc::MediaStreamTrackInterface* FindVideoTrack(
-      const std::string& id) OVERRIDE {
+  webrtc::MediaStreamTrackInterface* FindVideoTrack(
+      const std::string& id) override {
     for (size_t i = 0; i < streams_.size(); ++i) {
       webrtc::MediaStreamTrackInterface* track =
           streams_.at(i)->FindVideoTrack(id);
@@ -72,7 +68,7 @@ class MockStreamCollection : public webrtc::StreamCollectionInterface {
   }
 
  protected:
-  virtual ~MockStreamCollection() {}
+  ~MockStreamCollection() override {}
 
  private:
   typedef std::vector<rtc::scoped_refptr<MediaStreamInterface> >
@@ -90,65 +86,48 @@ class MockDataChannel : public webrtc::DataChannelInterface {
         config_(*config) {
   }
 
-  virtual void RegisterObserver(
-      webrtc::DataChannelObserver* observer) OVERRIDE {
-  }
+  void RegisterObserver(webrtc::DataChannelObserver* observer) override {}
 
-  virtual void UnregisterObserver() OVERRIDE {
-  }
+  void UnregisterObserver() override {}
 
-  virtual std::string label() const OVERRIDE {
-    return label_;
-  }
+  std::string label() const override { return label_; }
 
-  virtual bool reliable() const OVERRIDE {
-    return reliable_;
-  }
+  bool reliable() const override { return reliable_; }
 
-  virtual bool ordered() const OVERRIDE {
-    return config_.ordered;
-  }
+  bool ordered() const override { return config_.ordered; }
 
-  virtual unsigned short maxRetransmitTime() const OVERRIDE {
+  unsigned short maxRetransmitTime() const override {
     return config_.maxRetransmitTime;
   }
 
-  virtual unsigned short maxRetransmits() const OVERRIDE {
+  unsigned short maxRetransmits() const override {
     return config_.maxRetransmits;
   }
 
-  virtual std::string protocol() const OVERRIDE {
-    return config_.protocol;
-  }
+  std::string protocol() const override { return config_.protocol; }
 
-  virtual bool negotiated() const OVERRIDE {
-    return config_.negotiated;
-  }
+  bool negotiated() const override { return config_.negotiated; }
 
-  virtual int id() const OVERRIDE {
+  int id() const override {
     NOTIMPLEMENTED();
     return 0;
   }
 
-  virtual DataState state() const OVERRIDE {
-    return state_;
-  }
+  DataState state() const override { return state_; }
 
-  virtual uint64 buffered_amount() const OVERRIDE {
+  uint64 buffered_amount() const override {
     NOTIMPLEMENTED();
     return 0;
   }
 
-  virtual void Close() OVERRIDE {
-    state_ = webrtc::DataChannelInterface::kClosing;
-  }
+  void Close() override { state_ = webrtc::DataChannelInterface::kClosing; }
 
-  virtual bool Send(const webrtc::DataBuffer& buffer) OVERRIDE {
+  bool Send(const webrtc::DataBuffer& buffer) override {
     return state_ == webrtc::DataChannelInterface::kOpen;
   }
 
  protected:
-  virtual ~MockDataChannel() {}
+  ~MockDataChannel() override {}
 
  private:
   std::string label_;
@@ -164,34 +143,26 @@ class MockDtmfSender : public DtmfSenderInterface {
         observer_(NULL),
         duration_(0),
         inter_tone_gap_(0) {}
-  virtual void RegisterObserver(
-      DtmfSenderObserverInterface* observer) OVERRIDE {
+  void RegisterObserver(DtmfSenderObserverInterface* observer) override {
     observer_ = observer;
   }
-  virtual void UnregisterObserver() OVERRIDE {
-    observer_ = NULL;
-  }
-  virtual bool CanInsertDtmf() OVERRIDE {
-    return true;
-  }
-  virtual bool InsertDtmf(const std::string& tones, int duration,
-                          int inter_tone_gap) OVERRIDE {
+  void UnregisterObserver() override { observer_ = NULL; }
+  bool CanInsertDtmf() override { return true; }
+  bool InsertDtmf(const std::string& tones,
+                  int duration,
+                  int inter_tone_gap) override {
     tones_ = tones;
     duration_ = duration;
     inter_tone_gap_ = inter_tone_gap;
     return true;
   }
-  virtual const AudioTrackInterface* track() const OVERRIDE {
-    return track_.get();
-  }
-  virtual std::string tones() const OVERRIDE {
-    return tones_;
-  }
-  virtual int duration() const OVERRIDE { return duration_; }
-  virtual int inter_tone_gap() const OVERRIDE { return inter_tone_gap_; }
+  const AudioTrackInterface* track() const override { return track_.get(); }
+  std::string tones() const override { return tones_; }
+  int duration() const override { return duration_; }
+  int inter_tone_gap() const override { return inter_tone_gap_; }
 
  protected:
-  virtual ~MockDtmfSender() {}
+  ~MockDtmfSender() override {}
 
  private:
   rtc::scoped_refptr<AudioTrackInterface> track_;
@@ -205,14 +176,16 @@ const char MockPeerConnectionImpl::kDummyOffer[] = "dummy offer";
 const char MockPeerConnectionImpl::kDummyAnswer[] = "dummy answer";
 
 MockPeerConnectionImpl::MockPeerConnectionImpl(
-    MockPeerConnectionDependencyFactory* factory)
+    MockPeerConnectionDependencyFactory* factory,
+    webrtc::PeerConnectionObserver* observer)
     : dependency_factory_(factory),
       local_streams_(new rtc::RefCountedObject<MockStreamCollection>),
       remote_streams_(new rtc::RefCountedObject<MockStreamCollection>),
       hint_audio_(false),
       hint_video_(false),
       getstats_result_(true),
-      sdp_mline_index_(-1) {
+      sdp_mline_index_(-1),
+      observer_(observer) {
   ON_CALL(*this, SetLocalDescription(_, _)).WillByDefault(testing::Invoke(
       this, &MockPeerConnectionImpl::SetLocalDescriptionWorker));
   ON_CALL(*this, SetRemoteDescription(_, _)).WillByDefault(testing::Invoke(
@@ -231,9 +204,7 @@ MockPeerConnectionImpl::remote_streams() {
   return remote_streams_;
 }
 
-bool MockPeerConnectionImpl::AddStream(
-    MediaStreamInterface* local_stream,
-    const MediaConstraintsInterface* constraints) {
+bool MockPeerConnectionImpl::AddStream(MediaStreamInterface* local_stream) {
   DCHECK(stream_label_.empty());
   stream_label_ = local_stream->label();
   local_streams_->AddStream(local_stream);