Replace includes of webrtc/base/task.h and taskparent.h.

third_party/libjingle_xmpp/xmpp/xmppclient.h

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_LIBJINGLE_XMPP_XMPPCLIENT_H_
 #define WEBRTC_LIBJINGLE_XMPP_XMPPCLIENT_H_
 
 #include <memory>
 #include <string>
 
+#include "third_party/libjingle_xmpp/task_runner/task.h"
 #include "third_party/libjingle_xmpp/xmpp/asyncsocket.h"
 #include "third_party/libjingle_xmpp/xmpp/xmppclientsettings.h"
 #include "third_party/libjingle_xmpp/xmpp/xmppengine.h"
 #include "third_party/libjingle_xmpp/xmpp/xmpptask.h"
 #include "third_party/webrtc/base/sigslot.h"
-#include "third_party/webrtc/base/task.h"
 
 namespace buzz {
 
 class PreXmppAuth;
 class CaptchaChallenge;
 
 // Just some non-colliding number.  Could have picked "1".
 #define XMPP_CLIENT_TASK_CODE 0x366c1e47
 
 /////////////////////////////////////////////////////////////////////
@@ skipping 107 matching lines @@
   friend class Private;
   std::unique_ptr<Private> d_;
 
   bool delivering_signal_;
   bool valid_;
 };
 
 }
 
 #endif  // WEBRTC_LIBJINGLE_XMPP_XMPPCLIENT_H_