Rolling libjingle to 158:159

content/renderer/media/mock_peer_connection_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_MOCK_PEER_CONNECTION_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_MOCK_PEER_CONNECTION_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 38 matching lines @@
   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()
       const OVERRIDE;
 
+  // JSEP01 APIs
+  virtual void CreateOffer(CreateSessionDescriptionObserver* observer,
+                           const SessionDescriptionOptions& options) OVERRIDE;
+  virtual void CreateAnswer(CreateSessionDescriptionObserver* observer,
+                            const SessionDescriptionOptions& options) OVERRIDE;
+  virtual void SetLocalDescription(SetSessionDescriptionObserver* observer,
+                                   SessionDescriptionInterface* desc) OVERRIDE;
+  virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer,
+                                    SessionDescriptionInterface* desc) OVERRIDE;
+  virtual bool UpdateIce(const IceServers& configuration,
+                         IceOptions options) OVERRIDE;
+  virtual bool AddIceCandidate(const IceCandidateInterface* candidate) OVERRIDE;
+  virtual IceState ice_state() OVERRIDE;
+
   void AddRemoteStream(MediaStreamInterface* stream);
   void ClearStreamChangesCommitted() { stream_changes_committed_ = false; }
   void SetReadyState(ReadyState state) { ready_state_ = state; }
 
   const std::string& signaling_message() const { return signaling_message_; }
   const std::string& stream_label() const { return stream_label_; }
   bool stream_changes_committed() const { return stream_changes_committed_; }
   bool hint_audio() const { return hint_audio_; }
   bool hint_video() const { return hint_video_; }
   Action action() const { return action_; }
@@ skipping 26 matching lines @@
   std::string ice_label_;
   std::string ice_sdp_;
   ReadyState ready_state_;
 
   DISALLOW_COPY_AND_ASSIGN(MockPeerConnectionImpl);
 };
 
 }  // namespace webrtc
 
 #endif  // CONTENT_RENDERER_MEDIA_MOCK_PEER_CONNECTION_IMPL_H_