Update libjingle to the latest version.

BUG=None
TEST=Unittests

Review URL: http://codereview.chromium.org/7795059

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100278 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 12 deletions

diff --git a/jingle/notifier/base/fake_base_task.cc b/jingle/notifier/base/fake_base_task.cc
index 694bac0..9dceec0 100644
--- a/jingle/notifier/base/fake_base_task.cc
+++ b/jingle/notifier/base/fake_base_task.cc
@@ -45,7 +45,7 @@ FakeBaseTask::FakeBaseTask() {
 
 FakeBaseTask::~FakeBaseTask() {}
 
-base::WeakPtr<talk_base::Task> FakeBaseTask::AsWeakPtr() {
+base::WeakPtr<buzz::XmppTaskParentInterface> FakeBaseTask::AsWeakPtr() {
   return base_task_;
 }
 
diff --git a/jingle/notifier/base/fake_base_task.h b/jingle/notifier/base/fake_base_task.h
index 2efc40e..c39e3f3 100644
--- a/jingle/notifier/base/fake_base_task.h
+++ b/jingle/notifier/base/fake_base_task.h
@@ -13,9 +13,9 @@
 #include "base/memory/weak_ptr.h"
 #include "jingle/notifier/base/task_pump.h"
 
-namespace talk_base {
-class Task;
-}  // namespace talk_base
+namespace buzz {
+class XmppTaskParentInterface;
+}  // namespace buzz
 
 namespace notifier {
 
@@ -24,11 +24,11 @@ class FakeBaseTask {
   FakeBaseTask();
   ~FakeBaseTask();
 
-  base::WeakPtr<talk_base::Task> AsWeakPtr();
+  base::WeakPtr<buzz::XmppTaskParentInterface> AsWeakPtr();
 
  private:
   notifier::TaskPump task_pump_;
-  base::WeakPtr<talk_base::Task> base_task_;
+  base::WeakPtr<buzz::XmppTaskParentInterface> base_task_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeBaseTask);
 };
diff --git a/jingle/notifier/base/xmpp_connection.h b/jingle/notifier/base/xmpp_connection.h
index 278a6a2..9f142b1 100644
--- a/jingle/notifier/base/xmpp_connection.h
+++ b/jingle/notifier/base/xmpp_connection.h
@@ -22,10 +22,7 @@ namespace buzz {
 class PreXmppAuth;
 class XmlElement;
 class XmppClientSettings;
-}  // namespace
-
-namespace talk_base {
-class Task;
+class XmppTaskParentInterface;
 }  // namespace
 
 namespace notifier {
@@ -42,7 +39,8 @@ class XmppConnection : public sigslot::has_slots<> {
     // Called (at most once) when a connection has been established.
     // |base_task| can be used by the client as the parent of any Task
     // it creates as long as it is valid (i.e., non-NULL).
-    virtual void OnConnect(base::WeakPtr<talk_base::Task> base_task) = 0;
+    virtual void OnConnect(
+        base::WeakPtr<buzz::XmppTaskParentInterface> base_task) = 0;
 
     // Called if an error has occurred (either before or after a call
     // to OnConnect()).  No calls to the delegate will be made after
diff --git a/jingle/notifier/base/xmpp_connection_unittest.cc b/jingle/notifier/base/xmpp_connection_unittest.cc
index 4e1baa3..e2c88cd 100644
--- a/jingle/notifier/base/xmpp_connection_unittest.cc
+++ b/jingle/notifier/base/xmpp_connection_unittest.cc
@@ -89,7 +89,7 @@ class MockXmppConnectionDelegate : public XmppConnection::Delegate {
  public:
   virtual ~MockXmppConnectionDelegate() {}
 
-  MOCK_METHOD1(OnConnect, void(base::WeakPtr<talk_base::Task>));
+  MOCK_METHOD1(OnConnect, void(base::WeakPtr<buzz::XmppTaskParentInterface>));
   MOCK_METHOD3(OnError,
                void(buzz::XmppEngine::Error, int, const buzz::XmlElement*));
 };