Revert "Update webrtc&libjingle 6774:6799."

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/strings/string_number_conversions.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/content_description.h"
@@ skipping 59 matching lines @@
   if (name.empty() || address.empty() || !base::StringToInt(port_str, &port) ||
       port < kPortMin || port > kPortMax || type.empty() || protocol.empty() ||
       username.empty() || password.empty() ||
       !base::StringToDouble(preference_str, &preference) ||
       !base::StringToInt(generation_str, &generation)) {
     return false;
   }
 
   candidate->name = name;
 
-  candidate->candidate.set_address(rtc::SocketAddress(address, port));
+  candidate->candidate.set_address(talk_base::SocketAddress(address, port));
   candidate->candidate.set_type(type);
   candidate->candidate.set_protocol(protocol);
   candidate->candidate.set_username(username);
   candidate->candidate.set_password(password);
   candidate->candidate.set_preference(static_cast<float>(preference));
   candidate->candidate.set_generation(generation);
 
   return true;
 }
 
@@ skipping 330 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