Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified Diff: extensions/browser/api/socket/socket_api.cc

Issue 1136843008: Remove --enable-firewall-hole-punching flag, default to enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert histograms.xml change. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/chromeos_switches.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/socket/socket_api.cc
diff --git a/extensions/browser/api/socket/socket_api.cc b/extensions/browser/api/socket/socket_api.cc
index 881ae6ce290020fa779095dbdbb1891ee98c5e27..838b770481092fa6a11967c79159bcfed8f95c05 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.";
« no previous file with comments | « chromeos/chromeos_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698