Roll WebRTC 7546:7549.

jingle/notifier/base/xmpp_connection.h

 // 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.
 //
 // A class that manages a connection to an XMPP server.
 
 #ifndef JINGLE_NOTIFIER_BASE_XMPP_CONNECTION_H_
 #define JINGLE_NOTIFIER_BASE_XMPP_CONNECTION_H_
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "talk/xmpp/xmppengine.h"
 #include "webrtc/base/sigslot.h"
+#include "webrtc/libjingle/xmpp/xmppengine.h"
 
 namespace buzz {
 class PreXmppAuth;
 class XmlElement;
 class XmppClientSettings;
 class XmppTaskParentInterface;
 }  // namespace
 
 namespace jingle_glue {
 class TaskPump;
@@ skipping 67 matching lines @@
   FRIEND_TEST(XmppConnectionTest, MultipleConnect);
   FRIEND_TEST(XmppConnectionTest, ConnectThenError);
   FRIEND_TEST(XmppConnectionTest, TasksDontRunAfterXmppConnectionDestructor);
 
   DISALLOW_COPY_AND_ASSIGN(XmppConnection);
 };
 
 }  // namespace notifier
 
 #endif  // JINGLE_NOTIFIER_BASE_XMPP_CONNECTION_H_