diff options
| author | reillyg <reillyg@chromium.org> | 2015-05-14 15:37:58 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-14 22:38:46 +0000 |
| commit | 335730eaff11508dcf50445ec9db2812a2a31360 (patch) | |
| tree | 8bf1a10530b6dcd297023f4aaf9a5d93ca04b7d0 /extensions | |
| parent | 91476732a935bbd26036a6f3779a4946c4978ddc (diff) | |
| download | chromium_src-335730eaff11508dcf50445ec9db2812a2a31360.zip chromium_src-335730eaff11508dcf50445ec9db2812a2a31360.tar.gz chromium_src-335730eaff11508dcf50445ec9db2812a2a31360.tar.bz2 | |
Remove --enable-firewall-hole-punching flag, default to enabled.
Enable firewall hole punching for Chrome Apps by taking this feature out
from behind a flag.
BUG=478231
Review URL: https://codereview.chromium.org/1136843008
Cr-Commit-Position: refs/heads/master@{#329959}
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/browser/api/socket/socket_api.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/extensions/browser/api/socket/socket_api.cc b/extensions/browser/api/socket/socket_api.cc index 881ae6c..838b770 100644 --- a/extensions/browser/api/socket/socket_api.cc +++ b/extensions/browser/api/socket/socket_api.cc @@ -29,8 +29,6 @@ #include "net/url_request/url_request_context_getter.h" #if defined(OS_CHROMEOS) -#include "base/command_line.h" -#include "chromeos/chromeos_switches.h" #include "content/public/browser/browser_thread.h" #endif // OS_CHROMEOS @@ -104,9 +102,7 @@ void SocketAsyncApiFunction::OpenFirewallHole(const std::string& address, int socket_id, Socket* socket) { #if defined(OS_CHROMEOS) - if (!net::IsLocalhost(address) && - base::CommandLine::ForCurrentProcess()->HasSwitch( - chromeos::switches::kEnableFirewallHolePunching)) { + if (!net::IsLocalhost(address)) { net::IPEndPoint local_address; if (!socket->GetLocalAddress(&local_address)) { NOTREACHED() << "Cannot get address of recently bound socket."; |