Rolling libjingle to 158:159

content/renderer/media/mock_peer_connection_impl.cc

Index: content/renderer/media/mock_peer_connection_impl.cc
===================================================================
--- content/renderer/media/mock_peer_connection_impl.cc	(revision 146359)
+++ content/renderer/media/mock_peer_connection_impl.cc	(working copy)
@@ -167,4 +167,31 @@
   remote_streams_->AddStream(stream);
 }
 
+// TODO(perkj): Implement JSEP01 mock functions.
+void MockPeerConnectionImpl::CreateOffer(
+    CreateSessionDescriptionObserver* observer,
+    const SessionDescriptionOptions& options) {}

[Sergey Ulanov, 2012/07/13 01:22:48]

move } to the next line.

[Ronghua Wu (Left Chromium), 2012/07/13 18:26:35]

Done.

+
+void MockPeerConnectionImpl::CreateAnswer(
+    CreateSessionDescriptionObserver* observer,
+    const SessionDescriptionOptions& options) {}
+
+void MockPeerConnectionImpl::SetLocalDescription(
+    SetSessionDescriptionObserver* observer,
+    SessionDescriptionInterface* desc) {}
+
+void MockPeerConnectionImpl::SetRemoteDescription(
+    SetSessionDescriptionObserver* observer,
+    SessionDescriptionInterface* desc) {}
+
+bool MockPeerConnectionImpl::UpdateIce(const IceServers& configuration,
+    IceOptions options) { return false; }

[Sergey Ulanov, 2012/07/13 01:22:48]

move return to a separate line. This style is used only in headers for function
that fit in one line.

[Ronghua Wu (Left Chromium), 2012/07/13 18:26:35]

Done.

+
+bool MockPeerConnectionImpl::AddIceCandidate(
+    const IceCandidateInterface* candidate) { return false; }
+
+PeerConnectionInterface::IceState MockPeerConnectionImpl::ice_state() {
+  return kIceNew;
+}
+
 }  // namespace webrtc