Revert "Update webrtc&libjingle 6774:6799."

remoting/client/plugin/pepper_network_manager.cc

Index: remoting/client/plugin/pepper_network_manager.cc
diff --git a/remoting/client/plugin/pepper_network_manager.cc b/remoting/client/plugin/pepper_network_manager.cc
index b019320cac2cd61daf7a9a97912f58800acc3741..a60d3304b80b741a2fca0ed1eaf29232ebd609e0 100644
--- a/remoting/client/plugin/pepper_network_manager.cc
+++ b/remoting/client/plugin/pepper_network_manager.cc
@@ -12,7 +12,7 @@
 #include "ppapi/cpp/net_address.h"
 #include "ppapi/cpp/network_list.h"
 #include "remoting/client/plugin/pepper_util.h"
-#include "third_party/webrtc/base/socketaddress.h"
+#include "third_party/libjingle/source/talk/base/socketaddress.h"
 
 namespace remoting {
 
@@ -63,8 +63,8 @@ void PepperNetworkManager::OnNetworkList(int32_t result,
           &PepperNetworkManager::OnNetworkList);
   monitor_.UpdateNetworkList(callback);
 
-  // Convert the networks to rtc::Network.
-  std::vector<rtc::Network*> networks;
+  // Convert the networks to talk_base::Network.
+  std::vector<talk_base::Network*> networks;
   size_t count = list.GetCount();
   for (size_t i = 0; i < count; i++) {
     std::vector<pp::NetAddress> addresses;
@@ -74,7 +74,7 @@ void PepperNetworkManager::OnNetworkList(int32_t result,
       continue;
 
     for (size_t i = 0; i < addresses.size(); ++i) {
-      rtc::SocketAddress address;
+      talk_base::SocketAddress address;
       PpNetAddressToSocketAddress(addresses[i], &address);
 
       if (address.family() == AF_INET6 && IPIsSiteLocal(address.ipaddr())) {
@@ -84,7 +84,7 @@ void PepperNetworkManager::OnNetworkList(int32_t result,
         continue;
       }
 
-      rtc::Network* network = new rtc::Network(
+      talk_base::Network* network = new talk_base::Network(
           list.GetName(i), list.GetDisplayName(i), address.ipaddr(), 0);
       network->AddIP(address.ipaddr());
       networks.push_back(network);