Update webrtc&libjingle 6774:6825.

remoting/signaling/xmpp_signal_strategy.h

 // 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.
 
 // The XmppSignalStrategy encapsulates all the logic to perform the signaling
 // STUN/ICE for jingle via a direct XMPP connection.
 //
 // This class is not threadsafe.
 
 #ifndef REMOTING_SIGNALING_XMPP_SIGNAL_STRATEGY_H_
 #define REMOTING_SIGNALING_XMPP_SIGNAL_STRATEGY_H_
 
 #include "remoting/signaling/signal_strategy.h"
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/timer/timer.h"
-#include "third_party/libjingle/source/talk/base/sigslot.h"
 #include "third_party/libjingle/source/talk/xmpp/xmppclient.h"
+#include "third_party/webrtc/base/sigslot.h"
 
 namespace net {
 class ClientSocketFactory;
 class URLRequestContextGetter;
 }  // namespace net
 
-namespace talk_base {
+namespace rtc {
 class TaskRunner;
-}  // namespace talk_base
+}  // namespace rtc
 
 namespace remoting {
 
 class JingleThread;
 
 class XmppSignalStrategy : public base::NonThreadSafe,
                            public SignalStrategy,
                            public buzz::XmppStanzaHandler,
                            public sigslot::has_slots<> {
  public:
@@ skipping 47 matching lines @@
       const buzz::XmppClientSettings& settings);
 
   void OnConnectionStateChanged(buzz::XmppEngine::State state);
   void SetState(State new_state);
 
   void SendKeepAlive();
 
   net::ClientSocketFactory* socket_factory_;
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
   std::string resource_name_;
-  scoped_ptr<talk_base::TaskRunner> task_runner_;
+  scoped_ptr<rtc::TaskRunner> task_runner_;
   buzz::XmppClient* xmpp_client_;
   XmppServerConfig xmpp_server_config_;
 
   State state_;
   Error error_;
 
   ObserverList<Listener, true> listeners_;
 
   base::RepeatingTimer<XmppSignalStrategy> keep_alive_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(XmppSignalStrategy);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_SIGNALING_XMPP_SIGNAL_STRATEGY_H_