Revert of Removing HTTPS and SOCKS proxy server code.

webrtc/p2p/base/relayport.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include <algorithm>
@@ skipping 192 matching lines @@
   // TODO: set local preference value for TCP based candidates.
 }
 
 RelayPort::~RelayPort() {
   for (size_t i = 0; i < entries_.size(); ++i)
     delete entries_[i];
   thread()->Clear(this);
 }
 
 void RelayPort::AddServerAddress(const ProtocolAddress& addr) {
-  server_addr_.push_back(addr);
+  // Since HTTP proxies usually only allow 443,
+  // let's up the priority on PROTO_SSLTCP
+  if (addr.proto == PROTO_SSLTCP &&
+      (proxy().type == rtc::PROXY_HTTPS ||
+       proxy().type == rtc::PROXY_UNKNOWN)) {
+    server_addr_.push_front(addr);
+  } else {
+    server_addr_.push_back(addr);
+  }
 }
 
 void RelayPort::AddExternalAddress(const ProtocolAddress& addr) {
   std::string proto_name = ProtoToString(addr.proto);
   for (std::vector<ProtocolAddress>::iterator it = external_addr_.begin();
        it != external_addr_.end(); ++it) {
     if ((it->address == addr.address) && (it->proto == addr.proto)) {
       LOG(INFO) << "Redundant relay address: " << proto_name
                 << " @ " << addr.address.ToSensitiveString();
       return;
@@ skipping 607 matching lines @@
   if (rtc::TimeMillis() - start_time_ <= kRetryTimeout)
     entry_->ScheduleKeepAlive();
 }
 
 void AllocateRequest::OnTimeout() {
   LOG(INFO) << "Allocate request timed out";
   entry_->HandleConnectFailure(connection_->socket());
 }
 
 }  // namespace cricket