Roll libjingle 257:260.

content/renderer/media/mock_peer_connection_impl.h

Index: content/renderer/media/mock_peer_connection_impl.h
===================================================================
--- content/renderer/media/mock_peer_connection_impl.h	(revision 176188)
+++ content/renderer/media/mock_peer_connection_impl.h	(working copy)
@@ -42,21 +42,9 @@
   virtual bool GetStats(webrtc::StatsObserver* observer,
                         webrtc::MediaStreamTrackInterface* track) OVERRIDE;
   virtual ReadyState ready_state() OVERRIDE;
+  virtual SignalingState signaling_state() OVERRIDE;
   virtual bool StartIce(IceOptions options) OVERRIDE;
 
-  virtual webrtc::SessionDescriptionInterface* CreateOffer(
-      const webrtc::MediaHints& hints) OVERRIDE;
-  virtual webrtc::SessionDescriptionInterface* CreateAnswer(
-      const webrtc::MediaHints& hints,
-      const webrtc::SessionDescriptionInterface* offer) OVERRIDE;
-  virtual bool SetLocalDescription(
-      Action action,
-      webrtc::SessionDescriptionInterface* desc) OVERRIDE;
-  virtual bool SetRemoteDescription(
-      Action action,
-      webrtc::SessionDescriptionInterface* desc) OVERRIDE;
-  virtual bool ProcessIceMessage(
-      const webrtc::IceCandidateInterface* ice_candidate) OVERRIDE;
   virtual const webrtc::SessionDescriptionInterface* local_description()
       const OVERRIDE;
   virtual const webrtc::SessionDescriptionInterface* remote_description()
@@ -83,13 +71,12 @@
   virtual IceState ice_state() OVERRIDE;
 
   void AddRemoteStream(webrtc::MediaStreamInterface* stream);
-  void SetReadyState(ReadyState state) { ready_state_ = state; }
+  void SetReadyState(ReadyState state) { signaling_state_ = state; }
   void SetIceState(IceState state) { ice_state_ = state; }
 
   const std::string& stream_label() const { return stream_label_; }
   bool hint_audio() const { return hint_audio_; }
   bool hint_video() const { return hint_video_; }
-  Action action() const { return action_; }
   const std::string& description_sdp() const { return description_sdp_; }
   IceOptions ice_options() const { return ice_options_; }
   const std::string& sdp_mid() const { return sdp_mid_; }
@@ -116,13 +103,12 @@
   scoped_ptr<webrtc::SessionDescriptionInterface> created_sessiondescription_;
   bool hint_audio_;
   bool hint_video_;
-  Action action_;
   std::string description_sdp_;
   IceOptions ice_options_;
   std::string sdp_mid_;
   int sdp_mline_index_;
   std::string ice_sdp_;
-  ReadyState ready_state_;
+  SignalingState signaling_state_;
   IceState ice_state_;
 
   DISALLOW_COPY_AND_ASSIGN(MockPeerConnectionImpl);