Revert 123635 - Implement timeouts for IQ requests.

remoting/protocol/jingle_messages.cc

 // 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.
 
 #include "remoting/protocol/jingle_messages.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/content_description.h"
@@ skipping 123 matching lines @@
 }  // namespace
 
 // static
 bool JingleMessage::IsJingleMessage(const buzz::XmlElement* stanza) {
   return
       stanza->Name() == QName(kJabberNamespace, "iq") &&
       stanza->Attr(QName("", "type")) == "set" &&
       stanza->FirstNamed(QName(kJingleNamespace, "jingle")) != NULL;
 }
 
-// static
-std::string JingleMessage::GetActionName(ActionType action) {
-  return ValueToName(kActionTypes, arraysize(kActionTypes), action);
-}
-
 JingleMessage::JingleMessage()
     : action(UNKNOWN_ACTION),
       reason(UNKNOWN_REASON) {
 }
 
 JingleMessage::JingleMessage(
     const std::string& to_value,
     ActionType action_value,
     const std::string& sid_value)
     : to(to_value),
@@ skipping 107 matching lines @@
         *error = "Failed to parse candidates";
         return false;
       }
       candidates.push_back(candidate);
     }
   }
 
   return true;
 }
 
-scoped_ptr<buzz::XmlElement> JingleMessage::ToXml() const {
+scoped_ptr<buzz::XmlElement> JingleMessage::ToXml() {
   scoped_ptr<XmlElement> root(
       new XmlElement(QName("jabber:client", "iq"), true));
 
   DCHECK(!to.empty());
   root->AddAttr(QName(kEmptyNamespace, "to"), to);
   if (!from.empty())
     root->AddAttr(QName(kEmptyNamespace, "from"), from);
   root->SetAttr(QName(kEmptyNamespace, "type"), "set");
 
   XmlElement* jingle_tag =
@@ skipping 147 matching lines @@
     text_elem->SetAttr(QName(kXmlNamespace, "lang"), "en");
     text_elem->SetBodyText(error_text);
     error->AddElement(text_elem);
   }
 
   return iq.Pass();
 }
 
 }  // namespace protocol
 }  // namespace remoting