Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2175)

Unified Diff: content/renderer/p2p/host_address_request.h

Issue 435823002: Revert "Update webrtc&libjingle 6774:6799." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/webrtc_logging.cc ('k') | content/renderer/p2p/host_address_request.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/p2p/host_address_request.h
diff --git a/content/renderer/p2p/host_address_request.h b/content/renderer/p2p/host_address_request.h
index ab454868dfc7c4dca1a657b7af933c9af09c9497..7c90b800495f3e89ce07951130885498ba206da3 100644
--- a/content/renderer/p2p/host_address_request.h
+++ b/content/renderer/p2p/host_address_request.h
@@ -11,7 +11,7 @@
#include "base/memory/ref_counted.h"
#include "content/common/content_export.h"
#include "net/base/net_util.h"
-#include "third_party/webrtc/base/asyncresolverinterface.h"
+#include "third_party/libjingle/source/talk/base/asyncresolverinterface.h"
namespace base {
class MessageLoop;
@@ -31,7 +31,7 @@ class P2PAsyncAddressResolver
P2PAsyncAddressResolver(P2PSocketDispatcher* dispatcher);
// Start address resolve process.
- void Start(const rtc::SocketAddress& addr,
+ void Start(const talk_base::SocketAddress& addr,
const DoneCallback& done_callback);
// Clients must unregister before exiting for cleanup.
void Cancel();
@@ -49,7 +49,7 @@ class P2PAsyncAddressResolver
virtual ~P2PAsyncAddressResolver();
- void DoSendRequest(const rtc::SocketAddress& host_name,
+ void DoSendRequest(const talk_base::SocketAddress& host_name,
const DoneCallback& done_callback);
void DoUnregister();
void OnResponse(const net::IPAddressList& address);
@@ -65,7 +65,7 @@ class P2PAsyncAddressResolver
// Accessed on the IPC thread only.
int32 request_id_;
bool registered_;
- std::vector<rtc::IPAddress> addresses_;
+ std::vector<talk_base::IPAddress> addresses_;
DoneCallback done_callback_;
DISALLOW_COPY_AND_ASSIGN(P2PAsyncAddressResolver);
« no previous file with comments | « content/renderer/media/webrtc_logging.cc ('k') | content/renderer/p2p/host_address_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698