1 files changed, 25 insertions, 24 deletions

diff --git a/chromium/content/browser/renderer_host/pepper/pepper_network_monitor_host.cc b/chromium/content/browser/renderer_host/pepper/pepper_network_monitor_host.cc
index b53a60b779b..bc5795b6e41 100644
--- a/chromium/content/browser/renderer_host/pepper/pepper_network_monitor_host.cc
+++ b/chromium/content/browser/renderer_host/pepper/pepper_network_monitor_host.cc
@@ -13,47 +13,49 @@
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/private/net_address_private_impl.h"
 
-
 namespace content {
 
 namespace {
 
 bool CanUseNetworkMonitor(bool external_plugin,
                           int render_process_id,
-                          int render_view_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+                          int render_frame_id) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   SocketPermissionRequest request = SocketPermissionRequest(
       SocketPermissionRequest::NETWORK_STATE, std::string(), 0);
-  return pepper_socket_utils::CanUseSocketAPIs(
-      external_plugin, false /* private_api */, &request, render_process_id,
-      render_view_id);
+  return pepper_socket_utils::CanUseSocketAPIs(external_plugin,
+                                               false /* private_api */,
+                                               &request,
+                                               render_process_id,
+                                               render_frame_id);
 }
 
 scoped_ptr<net::NetworkInterfaceList> GetNetworkList() {
   scoped_ptr<net::NetworkInterfaceList> list(new net::NetworkInterfaceList());
-  net::GetNetworkList(list.get());
+  net::GetNetworkList(list.get(), net::INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES);
   return list.Pass();
 }
 
 }  // namespace
 
-PepperNetworkMonitorHost::PepperNetworkMonitorHost(
-    BrowserPpapiHostImpl* host,
-    PP_Instance instance,
-    PP_Resource resource)
+PepperNetworkMonitorHost::PepperNetworkMonitorHost(BrowserPpapiHostImpl* host,
+                                                   PP_Instance instance,
+                                                   PP_Resource resource)
     : ResourceHost(host->GetPpapiHost(), instance, resource),
       weak_factory_(this) {
   int render_process_id;
-  int render_view_id;
-  host->GetRenderViewIDsForInstance(instance,
-                                    &render_process_id,
-                                    &render_view_id);
+  int render_frame_id;
+  host->GetRenderFrameIDsForInstance(
+      instance, &render_process_id, &render_frame_id);
 
   BrowserThread::PostTaskAndReplyWithResult(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(&CanUseNetworkMonitor, host->external_plugin(),
-                 render_process_id, render_view_id),
+      BrowserThread::UI,
+      FROM_HERE,
+      base::Bind(&CanUseNetworkMonitor,
+                 host->external_plugin(),
+                 render_process_id,
+                 render_frame_id),
       base::Bind(&PepperNetworkMonitorHost::OnPermissionCheckResult,
                  weak_factory_.GetWeakPtr()));
 }
@@ -62,9 +64,7 @@ PepperNetworkMonitorHost::~PepperNetworkMonitorHost() {
   net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
 }
 
-void PepperNetworkMonitorHost::OnIPAddressChanged() {
-  GetAndSendNetworkList();
-}
+void PepperNetworkMonitorHost::OnIPAddressChanged() { GetAndSendNetworkList(); }
 
 void PepperNetworkMonitorHost::OnPermissionCheckResult(
     bool can_use_network_monitor) {
@@ -79,11 +79,12 @@ void PepperNetworkMonitorHost::OnPermissionCheckResult(
 }
 
 void PepperNetworkMonitorHost::GetAndSendNetworkList() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // Call GetNetworkList() on a thread that allows blocking IO.
   base::PostTaskAndReplyWithResult(
-      BrowserThread::GetBlockingPool(), FROM_HERE,
+      BrowserThread::GetBlockingPool(),
+      FROM_HERE,
       base::Bind(&GetNetworkList),
       base::Bind(&PepperNetworkMonitorHost::SendNetworkList,
                  weak_factory_.GetWeakPtr()));
@@ -91,7 +92,7 @@ void PepperNetworkMonitorHost::GetAndSendNetworkList() {
 
 void PepperNetworkMonitorHost::SendNetworkList(
     scoped_ptr<net::NetworkInterfaceList> list) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   scoped_ptr<ppapi::proxy::SerializedNetworkList> list_copy(
       new ppapi::proxy::SerializedNetworkList(list->size()));