Revert of Use standard ICE in Chromoting.

remoting/protocol/jingle_messages.h

Index: remoting/protocol/jingle_messages.h
diff --git a/remoting/protocol/jingle_messages.h b/remoting/protocol/jingle_messages.h
index c83776ad4f3060215ce74efdfbd02dbafecafe45..e12c854489ee6755f3117192da02a3cfb717a3fb 100644
--- a/remoting/protocol/jingle_messages.h
+++ b/remoting/protocol/jingle_messages.h
@@ -12,10 +12,15 @@
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 #include "third_party/webrtc/p2p/base/candidate.h"
 
+
 namespace remoting {
 namespace protocol {
 
 class ContentDescription;
+
+extern const char kJabberNamespace[];
+extern const char kJingleNamespace[];
+extern const char kP2PTransportNamespace[];
 
 struct JingleMessage {
   enum ActionType {
@@ -37,23 +42,12 @@
   };
 
   struct NamedCandidate {
-    NamedCandidate() =  default;
+    NamedCandidate();
     NamedCandidate(const std::string& name,
                    const cricket::Candidate& candidate);
 
     std::string name;
     cricket::Candidate candidate;
-  };
-
-  struct IceCredentials {
-    IceCredentials() = default;
-    IceCredentials(std::string channel,
-                   std::string ufrag,
-                   std::string password);
-
-    std::string channel;
-    std::string ufrag;
-    std::string password;
   };
 
   JingleMessage();
@@ -74,15 +68,12 @@
 
   std::string from;
   std::string to;
-  ActionType action = UNKNOWN_ACTION;
+  ActionType action;
   std::string sid;
 
   std::string initiator;
 
   scoped_ptr<ContentDescription> description;
-
-  bool standard_ice = true;
-  std::list<IceCredentials> ice_credentials;
   std::list<NamedCandidate> candidates;
 
   // Content of session-info messages.
@@ -91,7 +82,7 @@
   // Value from the <reason> tag if it is present in the
   // message. Useful mainly for session-terminate messages, but Jingle
   // spec allows it in any message.
-  Reason reason = UNKNOWN_REASON;
+  Reason reason;
 };
 
 struct JingleMessageReply {