Simplify PPB_NetworkMonitor proxy.

content/browser/renderer_host/pepper/pepper_message_filter.cc

Index: content/browser/renderer_host/pepper/pepper_message_filter.cc
diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.cc b/content/browser/renderer_host/pepper/pepper_message_filter.cc
index 197a303c332414b088d8414af0de8037f019e6cb..3f1e59cf80749c691cca7f7dea2b0a6f951290b2 100644
--- a/content/browser/renderer_host/pepper/pepper_message_filter.cc
+++ b/content/browser/renderer_host/pepper/pepper_message_filter.cc
@@ -20,16 +20,13 @@ using ppapi::NetAddressPrivateImpl;
 
 namespace content {
 
+PepperMessageFilter::PepperMessageFilter() {}
+PepperMessageFilter::~PepperMessageFilter() {}
+
 bool PepperMessageFilter::OnMessageReceived(const IPC::Message& msg,
                                             bool* message_was_ok) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(PepperMessageFilter, msg, *message_was_ok)
-    // NetworkMonitor messages.
-    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBNetworkMonitor_Start,
-                        OnNetworkMonitorStart)
-    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBNetworkMonitor_Stop,
-                        OnNetworkMonitorStop)
-
     // X509 certificate messages.
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBX509Certificate_ParseDER,
                         OnX509CertificateParseDER);
@@ -39,41 +36,6 @@ bool PepperMessageFilter::OnMessageReceived(const IPC::Message& msg,
   return handled;
 }
 
-void PepperMessageFilter::OnIPAddressChanged() {
-  GetAndSendNetworkList();
-}
-
-PepperMessageFilter::PepperMessageFilter(
-    const ppapi::PpapiPermissions& permissions)
-    : permissions_(permissions) {
-}
-
-PepperMessageFilter::~PepperMessageFilter() {
-  if (!network_monitor_ids_.empty())
-    net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
-}
-
-void PepperMessageFilter::OnNetworkMonitorStart(uint32 plugin_dispatcher_id) {
-  // Support all in-process plugins, and ones with "private" permissions.
-  if (!permissions_.HasPermission(ppapi::PERMISSION_PRIVATE))
-    return;
-
-  if (network_monitor_ids_.empty())
-    net::NetworkChangeNotifier::AddIPAddressObserver(this);
-
-  network_monitor_ids_.insert(plugin_dispatcher_id);
-  GetAndSendNetworkList();
-}
-
-void PepperMessageFilter::OnNetworkMonitorStop(uint32 plugin_dispatcher_id) {
-  if (!permissions_.HasPermission(ppapi::PERMISSION_PRIVATE))
-    return;
-
-  network_monitor_ids_.erase(plugin_dispatcher_id);
-  if (network_monitor_ids_.empty())
-    net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
-}
-
 void PepperMessageFilter::OnX509CertificateParseDER(
     const std::vector<char>& der,
     bool* succeeded,
@@ -84,51 +46,4 @@ void PepperMessageFilter::OnX509CertificateParseDER(
       pepper_socket_utils::GetCertificateFields(&der[0], der.size(), result);
 }
 
-void PepperMessageFilter::GetAndSendNetworkList() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  BrowserThread::PostBlockingPoolTask(
-      FROM_HERE, base::Bind(&PepperMessageFilter::DoGetNetworkList, this));
-}
-
-void PepperMessageFilter::DoGetNetworkList() {
-  scoped_ptr<net::NetworkInterfaceList> list(new net::NetworkInterfaceList());
-  net::GetNetworkList(list.get());
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(&PepperMessageFilter::SendNetworkList,
-                 this, base::Passed(&list)));
-}
-
-void PepperMessageFilter::SendNetworkList(
-    scoped_ptr<net::NetworkInterfaceList> list) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  scoped_ptr< ::ppapi::NetworkList> list_copy(
-      new ::ppapi::NetworkList(list->size()));
-  for (size_t i = 0; i < list->size(); ++i) {
-    const net::NetworkInterface& network = list->at(i);
-    ::ppapi::NetworkInfo& network_copy = list_copy->at(i);
-    network_copy.name = network.name;
-
-    network_copy.addresses.resize(1, NetAddressPrivateImpl::kInvalidNetAddress);
-    bool result = NetAddressPrivateImpl::IPEndPointToNetAddress(
-        network.address, 0, &(network_copy.addresses[0]));
-    DCHECK(result);
-
-    // TODO(sergeyu): Currently net::NetworkInterfaceList provides
-    // only name and one IP address. Add all other fields and copy
-    // them here.
-    network_copy.type = PP_NETWORKLIST_UNKNOWN;
-    network_copy.state = PP_NETWORKLIST_UP;
-    network_copy.display_name = network.name;
-    network_copy.mtu = 0;
-  }
-  for (NetworkMonitorIdSet::iterator it = network_monitor_ids_.begin();
-       it != network_monitor_ids_.end(); ++it) {
-    Send(new PpapiMsg_PPBNetworkMonitor_NetworkList(
-        ppapi::API_ID_PPB_NETWORKMANAGER_PRIVATE, *it, *list_copy));

[yzshen1, 2013/09/11 22:51:26]

Please also remove the definition of the ID from api_id.h

[Sergey Ulanov, 2013/09/12 07:01:51]

Done.

-  }
-}
-
 }  // namespace content