Remove obsolete webkit_glue::P2PTransport interface.

content/renderer/p2p/port_allocator.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_P2P_PORT_ALLOCATOR_H_
 #define CONTENT_RENDERER_P2P_PORT_ALLOCATOR_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/net_util.h"
 #include "third_party/libjingle/source/talk/p2p/client/basicportallocator.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLLoaderClient.h"
-#include "webkit/glue/p2p_transport.h"
 
 namespace WebKit {
 class WebFrame;
 class WebURLLoader;
 }  // namespace WebKit
 
 namespace content {
 
 class P2PHostAddressRequest;
 class P2PPortAllocatorSession;
 class P2PSocketDispatcher;
 
-// TODO(sergeyu): There is overlap between this class and
-// HttpPortAllocator. Refactor HttpPortAllocator
+// TODO(sergeyu): There is overlap between this class and HttpPortAllocator.
+// Refactor this class to inherit from HttpPortAllocator to avoid code
+// duplication.
 class P2PPortAllocator : public cricket::BasicPortAllocator {
  public:
+  struct Config {
+    Config();
+    ~Config();
+
+    // STUN server address and port.
+    std::string stun_server;
+    int stun_server_port;
+
+    // Relay server address and port.
+    std::string relay_server;
+    int relay_server_port;
+
+    // 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

[brettw, 2012/08/15 19:18:49]

I think this comment may fit on one line.

[Sergey Ulanov, 2012/08/15 19:25:03]

Done.

+    // compliant).
+    bool legacy_relay;
+
+    // Disable TCP-based transport when set to true.
+    bool disable_tcp_transport;
+  };
+
   P2PPortAllocator(WebKit::WebFrame* web_frame,
                    P2PSocketDispatcher* socket_dispatcher,
                    talk_base::NetworkManager* network_manager,
                    talk_base::PacketSocketFactory* socket_factory,
-                   const webkit_glue::P2PTransport::Config& config);
+                   const Config& config);
   virtual ~P2PPortAllocator();
 
   virtual cricket::PortAllocatorSession* CreateSessionInternal(
       const std::string& content_name,
       int component,
       const std::string& ice_username_fragment,
       const std::string& ice_password) OVERRIDE;
 
  private:
   friend class P2PPortAllocatorSession;
 
   WebKit::WebFrame* web_frame_;
   P2PSocketDispatcher* socket_dispatcher_;
-  webkit_glue::P2PTransport::Config config_;
+  Config config_;
 
   DISALLOW_COPY_AND_ASSIGN(P2PPortAllocator);
 };
 
 class P2PPortAllocatorSession : public cricket::BasicPortAllocatorSession,
                                 public WebKit::WebURLLoaderClient  {
  public:
   P2PPortAllocatorSession(
       P2PPortAllocator* allocator,
       const std::string& content_name,
@@ skipping 37 matching lines @@
   int relay_udp_port_;
   int relay_tcp_port_;
   int relay_ssltcp_port_;
 
   DISALLOW_COPY_AND_ASSIGN(P2PPortAllocatorSession);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_P2P_PORT_ALLOCATOR_H_