Roll webrtc to r5549.

jingle/glue/fake_socket_factory.h

 // Copyright (c) 2011 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 JINGLE_GLUE_FAKE_SOCKET_FACTORY_H_
 #define JINGLE_GLUE_FAKE_SOCKET_FACTORY_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 21 matching lines @@
   virtual ~FakeUDPPacketSocket();
 
   const net::IPEndPoint& endpoint() const { return endpoint_; }
   void DeliverPacket(const net::IPEndPoint& from,
                      const std::vector<char>& data);
 
   // talk_base::AsyncPacketSocket implementation.
   virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE;
   virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE;
   virtual int Send(const void *pv, size_t cb,
-                   talk_base::DiffServCodePoint dscp) OVERRIDE;
+                   const talk_base::PacketOptions& options) OVERRIDE;
   virtual int SendTo(const void *pv, size_t cb,
                      const talk_base::SocketAddress& addr,
-                     talk_base::DiffServCodePoint dscp) OVERRIDE;
+                     const talk_base::PacketOptions& options) OVERRIDE;
   virtual int Close() OVERRIDE;
   virtual State GetState() const OVERRIDE;
   virtual int GetOption(talk_base::Socket::Option opt, int* value) OVERRIDE;
   virtual int SetOption(talk_base::Socket::Option opt, int value) OVERRIDE;
   virtual int GetError() const OVERRIDE;
   virtual void SetError(int error) OVERRIDE;
 
  private:
   enum InternalState {
     IS_OPEN,
@@ skipping 60 matching lines @@
   scoped_refptr<FakeSocketManager> socket_manager_;
   net::IPAddressNumber address_;
   int last_allocated_port_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeSocketFactory);
 };
 
 }  // namespace jingle_glue
 
 #endif  // JINGLE_GLUE_FAKE_SOCKET_FACTORY_H_