Revert "Update webrtc&libjingle 6774:6799."

jingle/notifier/base/gaia_token_pre_xmpp_auth.cc

 // Copyright (c) 2011 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 "jingle/notifier/base/gaia_token_pre_xmpp_auth.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
+#include "talk/base/socketaddress.h"
 #include "talk/xmpp/constants.h"
 #include "talk/xmpp/saslcookiemechanism.h"
-#include "webrtc/base/socketaddress.h"
 
 namespace notifier {
 
 namespace {
 
 class GaiaCookieMechanism : public buzz::SaslCookieMechanism {
  public:
   GaiaCookieMechanism(const std::string & mechanism,
                       const std::string & username,
                       const std::string & cookie,
@@ skipping 33 matching lines @@
       token_(token),
       token_service_(token_service),
       auth_mechanism_(auth_mechanism) {
   DCHECK(!auth_mechanism_.empty());
 }
 
 GaiaTokenPreXmppAuth::~GaiaTokenPreXmppAuth() { }
 
 void GaiaTokenPreXmppAuth::StartPreXmppAuth(
     const buzz::Jid& jid,
-    const rtc::SocketAddress& server,
-    const rtc::CryptString& pass,
+    const talk_base::SocketAddress& server,
+    const talk_base::CryptString& pass,
     const std::string& auth_mechanism,
     const std::string& auth_token) {
   SignalAuthDone();
 }
 
 bool GaiaTokenPreXmppAuth::IsAuthDone() const {
   return true;
 }
 
 bool GaiaTokenPreXmppAuth::IsAuthorized() const {
@@ skipping 30 matching lines @@
 
 buzz::SaslMechanism* GaiaTokenPreXmppAuth::CreateSaslMechanism(
     const std::string& mechanism) {
   if (mechanism == auth_mechanism_)
     return new GaiaCookieMechanism(
         mechanism, username_, token_, token_service_);
   return NULL;
 }
 
 }  // namespace notifier