Relay server support for P2P Transport API.

BUG=41776
TEST=None

Review URL: http://codereview.chromium.org/7791008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101396 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 20 insertions, 6 deletions

diff --git a/webkit/glue/p2p_transport.cc b/webkit/glue/p2p_transport.cc
index a4c518b..f79c21f 100644
--- a/webkit/glue/p2p_transport.cc
+++ b/webkit/glue/p2p_transport.cc
@@ -9,6 +9,7 @@ namespace webkit_glue {
 P2PTransport::Config::Config()
     : stun_server_port(0),
       relay_server_port(0),
+      legacy_relay(false),
       tcp_receive_window(0),
       tcp_send_window(0),
       tcp_no_delay(false),
diff --git a/webkit/glue/p2p_transport.h b/webkit/glue/p2p_transport.h
index 7795344..8e77d28 100644
--- a/webkit/glue/p2p_transport.h
+++ b/webkit/glue/p2p_transport.h
@@ -12,6 +12,10 @@ namespace net {
 class Socket;
 }  // namespace net
 
+namespace WebKit {
+class WebFrame;
+}  // namespace WebKit
+
 namespace webkit_glue {
 
 // Interface for P2P transport.
@@ -48,16 +52,23 @@ class P2PTransport {
     Config();
     ~Config();
 
-    // STUN server address and port, e.g. "stun.example.com:23542".
+    // STUN server address and port.
     std::string stun_server;
     int stun_server_port;
 
-    // Relay server address and port, e.g. "relay.example.com:4234".
+    // Relay server address and port.
     std::string relay_server;
     int relay_server_port;
 
-    // Relay token to use for relay servers.
-    std::string relay_token;
+    // Relay server username.
+    std::string relay_username;
+
+    // Relay server password.
+    std::string relay_password;
+
+    // When set to true relay is a legacy Google relay (not TURN
+    // compliant).
+    bool legacy_relay;
 
     // TCP window sizes. Default size is used when set to 0.
     int tcp_receive_window;
@@ -72,9 +83,11 @@ class P2PTransport {
 
   virtual ~P2PTransport() {}
 
-  // Initialize transport using specified configuration. Returns true
+  // Initialize transport using specified configuration. |web_frame|
+  // is used to make HTTP requests to relay servers. Returns true
   // if initialization succeeded.
-  virtual bool Init(const std::string& name,
+  virtual bool Init(WebKit::WebFrame* web_frame,
+                    const std::string& name,
                     Protocol protocol,
                     const Config& config,
                     EventHandler* event_handler) = 0;