Revert 125761 - Implement PPB_NetworkMonitor_Private Pepper interface.

content/renderer/p2p/socket_dispatcher.cc

 // 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.
 
 #include "content/renderer/p2p/socket_dispatcher.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop_proxy.h"
 #include "content/common/p2p_messages.h"
 #include "content/renderer/p2p/host_address_request.h"
 #include "content/renderer/p2p/socket_client.h"
 #include "content/renderer/render_view_impl.h"
-#include "webkit/glue/network_list_observer.h"
 
 namespace content {
 
 class P2PSocketDispatcher::AsyncMessageSender
     : public base::RefCountedThreadSafe<AsyncMessageSender> {
  public:
   explicit AsyncMessageSender(IPC::Message::Sender* message_sender)
       : message_loop_(base::MessageLoopProxy::current()),
         message_sender_(message_sender) {
   }
@@ skipping 19 matching lines @@
   IPC::Message::Sender* message_sender_;
 
   DISALLOW_COPY_AND_ASSIGN(AsyncMessageSender);
 };
 
 P2PSocketDispatcher::P2PSocketDispatcher(RenderViewImpl* render_view)
     : content::RenderViewObserver(render_view),
       message_loop_(base::MessageLoopProxy::current()),
       network_notifications_started_(false),
       network_list_observers_(
-          new ObserverListThreadSafe<webkit_glue::NetworkListObserver>()),
+          new ObserverListThreadSafe<NetworkListObserver>()),
       async_message_sender_(new AsyncMessageSender(this)) {
 }
 
 P2PSocketDispatcher::~P2PSocketDispatcher() {
   network_list_observers_->AssertEmpty();
   if (network_notifications_started_)
     Send(new P2PHostMsg_StopNetworkNotifications(routing_id()));
   for (IDMap<P2PSocketClient>::iterator i(&clients_); !i.IsAtEnd();
        i.Advance()) {
     i.GetCurrentValue()->Detach();
   }
   async_message_sender_->Detach();
 }
 
 void P2PSocketDispatcher::AddNetworkListObserver(
-    webkit_glue::NetworkListObserver* network_list_observer) {
+    NetworkListObserver* network_list_observer) {
   network_list_observers_->AddObserver(network_list_observer);
   network_notifications_started_ = true;
   async_message_sender_->Send(
       new P2PHostMsg_StartNetworkNotifications(routing_id()));
 }
 
 void P2PSocketDispatcher::RemoveNetworkListObserver(
-    webkit_glue::NetworkListObserver* network_list_observer) {
+    NetworkListObserver* network_list_observer) {
   network_list_observers_->RemoveObserver(network_list_observer);
 }
 
 bool P2PSocketDispatcher::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(P2PSocketDispatcher, message)
     IPC_MESSAGE_HANDLER(P2PMsg_NetworkListChanged, OnNetworkListChanged)
     IPC_MESSAGE_HANDLER(P2PMsg_GetHostAddressResult, OnGetHostAddressResult)
     IPC_MESSAGE_HANDLER(P2PMsg_OnSocketCreated, OnSocketCreated)
     IPC_MESSAGE_HANDLER(P2PMsg_OnIncomingTcpConnection, OnIncomingTcpConnection)
@@ skipping 25 matching lines @@
     P2PHostAddressRequest* request) {
   return host_address_requests_.Add(request);
 }
 
 void P2PSocketDispatcher::UnregisterHostAddressRequest(int id) {
   host_address_requests_.Remove(id);
 }
 
 void P2PSocketDispatcher::OnNetworkListChanged(
     const net::NetworkInterfaceList& networks) {
-  network_list_observers_->Notify(
-      &webkit_glue::NetworkListObserver::OnNetworkListChanged, networks);
+  network_list_observers_->Notify(&NetworkListObserver::OnNetworkListChanged,
+                                  networks);
 }
 
 void P2PSocketDispatcher::OnGetHostAddressResult(
     int32 request_id,
     const net::IPAddressNumber& address) {
   P2PHostAddressRequest* request = host_address_requests_.Lookup(request_id);
   if (!request) {
     VLOG(1) << "Received P2P message for socket that doesn't exist.";
     return;
   }
@@ skipping 40 matching lines @@
     // hasn't processed the close message by the time it sends the
     // message to the renderer.
     VLOG(1) << "Received P2P message for socket that doesn't exist.";
     return NULL;
   }
 
   return client;
 }
 
 }  // namespace content