libjingle roll 117:119

content/renderer/media/peer_connection_handler.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_PEER_CONNECTION_HANDLER_H_
 #define CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 46 matching lines @@
   // We will be deleted by WebKit after stop has been returned.
   virtual void stop() OVERRIDE;
 
   // webrtc::PeerConnectionObserver implementation
   virtual void OnError() OVERRIDE;
   virtual void OnMessage(const std::string& msg) OVERRIDE;
   virtual void OnSignalingMessage(const std::string& msg) OVERRIDE;
   virtual void OnStateChange(StateType state_changed) OVERRIDE;
   virtual void OnAddStream(webrtc::MediaStreamInterface* stream) OVERRIDE;
   virtual void OnRemoveStream(webrtc::MediaStreamInterface* stream) OVERRIDE;
+  virtual void OnIceCandidate(
+      const webrtc::IceCandidateInterface* candidate) OVERRIDE;
+  virtual void OnIceComplete() OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(PeerConnectionHandlerTest, Basic);
 
   void AddStreams(
       const WebKit::WebVector<WebKit::WebMediaStreamDescriptor>& streams);
   void RemoveStreams(
       const WebKit::WebVector<WebKit::WebMediaStreamDescriptor>& streams);
   void OnAddStreamCallback(webrtc::MediaStreamInterface* stream);
   void OnRemoveStreamCallback(webrtc::MediaStreamInterface* stream);
@@ skipping 19 matching lines @@
   typedef std::map<webrtc::MediaStreamInterface*,
                    WebKit::WebMediaStreamDescriptor> RemoteStreamMap;
   RemoteStreamMap remote_streams_;
 
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
 
   DISALLOW_COPY_AND_ASSIGN(PeerConnectionHandler);
 };
 
 #endif  // CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_H_