[jumbo] avoid g_num_instances clash in pepper_*_socket_message_filter.cc

Bug: 746953
Change-Id: Id2bf0dbb4c4c67a5905586c3cee28290dfc00da2
Reviewed-on: https://chromium-review.googlesource.com/696082Reviewed-by: Bill Budge <bbudge@chromium.org>
Commit-Queue: Mostyn Bramley-Moore <mostynb@vewd.com>
Cr-Commit-Position: refs/heads/master@{#505801}

content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc

@@ -52,7 +52,7 @@ using ppapi::TCPSocketVersion;
 
 namespace {
 
-size_t g_num_instances = 0;
+size_t g_num_tcp_filter_instances = 0;
 
 }  // namespace
 
@@ -87,7 +87,7 @@ PepperTCPSocketMessageFilter::PepperTCPSocketMessageFilter(
   DCHECK(host);
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
-  ++g_num_instances;
+  ++g_num_tcp_filter_instances;
   host_->AddInstanceObserver(instance_, this);
   if (!host->GetRenderFrameIDsForInstance(
           instance, &render_process_id_, &render_frame_id_)) {
@@ -125,7 +125,7 @@ PepperTCPSocketMessageFilter::PepperTCPSocketMessageFilter(
   DCHECK_NE(version, ppapi::TCP_SOCKET_VERSION_1_0);
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
-  ++g_num_instances;
+  ++g_num_tcp_filter_instances;
   host_->AddInstanceObserver(instance_, this);
   if (!host->GetRenderFrameIDsForInstance(
           instance, &render_process_id_, &render_frame_id_)) {
@@ -141,12 +141,12 @@ PepperTCPSocketMessageFilter::~PepperTCPSocketMessageFilter() {
     socket_->Close();
   if (ssl_socket_)
     ssl_socket_->Disconnect();
-  --g_num_instances;
+  --g_num_tcp_filter_instances;
 }
 
 // static
 size_t PepperTCPSocketMessageFilter::GetNumInstances() {
-  return g_num_instances;
+  return g_num_tcp_filter_instances;
 }
 
 scoped_refptr<base::TaskRunner>

content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc

@@ -45,7 +45,7 @@ using ppapi::proxy::UDPSocketResourceConstants;
 
 namespace {
 
-size_t g_num_instances = 0;
+size_t g_num_udp_filter_instances = 0;
 
 }  // namespace
 
@@ -82,7 +82,7 @@ PepperUDPSocketMessageFilter::PepperUDPSocketMessageFilter(
       render_frame_id_(0),
       is_potentially_secure_plugin_context_(
           host->IsPotentiallySecurePluginContext(instance)) {
-  ++g_num_instances;
+  ++g_num_udp_filter_instances;
   DCHECK(host);
 
   if (!host->GetRenderFrameIDsForInstance(
@@ -93,12 +93,12 @@ PepperUDPSocketMessageFilter::PepperUDPSocketMessageFilter(
 
 PepperUDPSocketMessageFilter::~PepperUDPSocketMessageFilter() {
   Close();
-  --g_num_instances;
+  --g_num_udp_filter_instances;
 }
 
 // static
 size_t PepperUDPSocketMessageFilter::GetNumInstances() {
-  return g_num_instances;
+  return g_num_udp_filter_instances;
 }
 
 scoped_refptr<base::TaskRunner>