Roll WebRTC 7011:7046 libjingle: 7007:7045

remoting/signaling/jingle_info_request.cc

 // Copyright 2014 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/signaling/jingle_info_request.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "net/base/net_util.h"
 #include "remoting/signaling/iq_sender.h"
-#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 #include "third_party/libjingle/source/talk/xmpp/constants.h"
 #include "third_party/webrtc/base/socketaddress.h"
+#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 
 namespace remoting {
 
 const int kRequestTimeoutSeconds = 5;
 
 JingleInfoRequest::JingleInfoRequest(SignalStrategy* signal_strategy)
     : iq_sender_(signal_strategy) {
 }
 
 JingleInfoRequest::~JingleInfoRequest() {}
@@ skipping 68 matching lines @@
       std::string host = server->Attr(buzz::QN_JINGLE_INFO_HOST);
       if (host != buzz::STR_EMPTY)
         relay_hosts.push_back(host);
     }
   }
 
   on_jingle_info_cb_.Run(relay_token, relay_hosts, stun_hosts);
 }
 
 }  // namespace remoting