Make the Pepper TCP open the firewall on Cros.

content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc

Index: content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
index aa63ab16308c0460405505cc639b591e355ec426..4e2bea473691ddab186c74864f540e3f15555dcb 100644
--- a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
+++ b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
@@ -36,6 +36,10 @@
 #include "ppapi/proxy/tcp_socket_resource_base.h"
 #include "ppapi/shared_impl/private/net_address_private_impl.h"
 
+#if defined(OS_CHROMEOS)
+#include "chromeos/network/firewall_hole.h"
+#endif  // defined(OS_CHROMEOS)
+
 using ppapi::NetAddressPrivateImpl;
 using ppapi::host::NetErrorToPepperError;
 using ppapi::proxy::TCPSocketResourceBase;
@@ -470,6 +474,10 @@ int32_t PepperTCPSocketMessageFilter::OnMsgClose(
     return PP_OK;
 
   state_.DoTransition(TCPSocketState::CLOSE, true);
+#if defined(OS_CHROMEOS)
+  // Close the firewall hole, it is no longer needed.
+  firewall_hole_.reset(nullptr);
+#endif  // defined(OS_CHROMEOS)
   // Make sure we get no further callbacks from |socket_| or |ssl_socket_|.
   if (socket_) {
     socket_->Close();
@@ -713,8 +721,7 @@ void PepperTCPSocketMessageFilter::DoListen(
   }
 
   int32_t pp_result = NetErrorToPepperError(socket_->Listen(backlog));
-  SendListenReply(context, pp_result);
-  state_.DoTransition(TCPSocketState::LISTEN, pp_result == PP_OK);
+  MaybeOpenFirewallHole(context, pp_result);

[bbudge, 2015/07/09 19:55:17]

Have chromeos-specific code here to make it clearer that original behavior is
preserved.

 }
 
 void PepperTCPSocketMessageFilter::OnResolveCompleted(
@@ -926,6 +933,49 @@ void PepperTCPSocketMessageFilter::OnWriteCompleted(
   write_buffer_base_ = NULL;
 }
 
+void PepperTCPSocketMessageFilter::ListenComplete(

[bbudge, 2015/07/09 19:55:17]

OnListenCompleted for consistency.

[avallee, 2015/07/13 18:29:10]

Done.

+    const ppapi::host::ReplyMessageContext& context,
+    int32_t pp_result) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  SendListenReply(context, pp_result);
+  state_.DoTransition(TCPSocketState::LISTEN, pp_result == PP_OK);
+}

[bbudge, 2015/07/09 19:55:17]

nit: blank line

[avallee, 2015/07/13 18:29:10]

Done.

+void PepperTCPSocketMessageFilter::MaybeOpenFirewallHole(
+    const ppapi::host::ReplyMessageContext& context,
+    int32_t pp_result) {
+#if defined(OS_CHROMEOS)
+  if (pp_result == PP_OK) {
+    net::IPEndPoint local_addr;
+    // Has already been called successfully in DoBind().
+    socket_->GetLocalAddress(&local_addr);
+    pepper_socket_utils::FirewallHoleOpenCallback callback =
+        base::Bind(&PepperTCPSocketMessageFilter::OnFirewallHoleOpened,
+                   base::Unretained(this), context, pp_result);
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE,
+        base::Bind(&pepper_socket_utils::OpenTCPFirewallHole, local_addr,
+                   callback));
+    return;
+  }
+#endif
+  ListenComplete(context, pp_result);
+}
+
+#if defined(OS_CHROMEOS)
+void PepperTCPSocketMessageFilter::OnFirewallHoleOpened(
+    const ppapi::host::ReplyMessageContext& context,
+    int32_t result,
+    scoped_ptr<chromeos::FirewallHole> hole) {
+  LOG_IF(WARNING, !hole.get()) << "Firewall hole could not be opened.";
+  firewall_hole_.reset(hole.release());
+
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::Bind(&PepperTCPSocketMessageFilter::ListenComplete,
+                 base::Unretained(this), context, result));
+}
+#endif  // defined(OS_CHROMEOS)
+
 void PepperTCPSocketMessageFilter::OnAcceptCompleted(
     const ppapi::host::ReplyMessageContext& context,
     int net_result) {