Revert change which removes GICE

webrtc/p2p/base/fakesession.h

Index: webrtc/p2p/base/fakesession.h
diff --git a/webrtc/p2p/base/fakesession.h b/webrtc/p2p/base/fakesession.h
index bd3c08902508fafc1cf414db3fecbb2d141e48bf..2ef9dd018bd02e5c73362ceffa0bf6925175465b 100644
--- a/webrtc/p2p/base/fakesession.h
+++ b/webrtc/p2p/base/fakesession.h
@@ -53,6 +53,7 @@ class FakeTransportChannel : public TransportChannelImpl,
         do_dtls_(false),
         role_(ICEROLE_UNKNOWN),
         tiebreaker_(0),
+        ice_proto_(ICEPROTO_HYBRID),
         remote_ice_mode_(ICEMODE_FULL),
         dtls_fingerprint_("", nullptr, 0),
         ssl_role_(rtc::SSL_CLIENT),
@@ -63,6 +64,7 @@ class FakeTransportChannel : public TransportChannelImpl,
   }
 
   uint64 IceTiebreaker() const { return tiebreaker_; }
+  TransportProtocol protocol() const { return ice_proto_; }
   IceMode remote_ice_mode() const { return remote_ice_mode_; }
   const std::string& ice_ufrag() const { return ice_ufrag_; }
   const std::string& ice_pwd() const { return ice_pwd_; }
@@ -102,6 +104,11 @@ class FakeTransportChannel : public TransportChannelImpl,
     ice_ufrag_ = ice_ufrag;
     ice_pwd_ = ice_pwd;
   }
+  bool GetIceProtocolType(IceProtocolType* type) const override {
+    *type = ice_proto_;
+    return true;
+  }
+  void SetIceProtocolType(IceProtocolType type) override { ice_proto_ = type; }
   void SetRemoteIceCredentials(const std::string& ice_ufrag,
                                const std::string& ice_pwd) override {
     remote_ice_ufrag_ = ice_ufrag;
@@ -312,6 +319,7 @@ class FakeTransportChannel : public TransportChannelImpl,
   std::string chosen_srtp_cipher_;
   IceRole role_;
   uint64 tiebreaker_;
+  IceProtocolType ice_proto_;
   std::string ice_ufrag_;
   std::string ice_pwd_;
   std::string remote_ice_ufrag_;
@@ -333,7 +341,7 @@ class FakeTransport : public Transport {
                 const std::string& content_name,
                 PortAllocator* alllocator = nullptr)
       : Transport(signaling_thread, worker_thread,
-                  content_name, nullptr),
+                  content_name, "test_type", nullptr),
         dest_(nullptr),
         async_(false) {
   }