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}

5 files changed, 1 insertions, 24 deletions

diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp
index 6c8a34a..096d703 100644
--- a/chrome/app/chromeos_strings.grdp
+++ b/chrome/app/chromeos_strings.grdp
@@ -6321,12 +6321,6 @@ All users must sign out to continue.
   <message name="IDS_OPTIONS_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION" desc="Label for checkbox to allow automatic timezone update by user geolocation.">
     Set time zone automatically using your location
   </message>
-  <message name="IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_NAME" desc="Name of the option to enable punching holes in the Chrome OS firewall.">
-    Enable firewall hole punching.
-  </message>
-  <message name="IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_DESCRIPTION" desc="Description of the option to enable punching holes in the Chrome OS firewall.">
-    Enable punching holes in the Chrome OS firewall for Chrome Apps that open a TCP/IP server socket or UDP socket.
-  </message>
   <message name="IDS_FILE_SYSTEM_REQUEST_FILE_SYSTEM_DIALOG_TITLE" desc="Title of a prompt dialog for granting permissions to a volume (eg. USB drive, SD card, MTP device) with the specified name.">
     Permission requested
   </message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index b5535f7..8c9eee7 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2335,15 +2335,6 @@ const Experiment kExperiments[] = {
     kOsDesktop,
     SINGLE_VALUE_TYPE(switches::kV8PacMojoOutOfProcess),
   },
-#if defined(OS_CHROMEOS)
-  {
-    "enable-firewall-hole-punching",
-    IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_NAME,
-    IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_DESCRIPTION,
-    kOsCrOS,
-    SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirewallHolePunching)
-  },
-#endif  // defined(OS_CHROMEOS)
 #if defined(ENABLE_MEDIA_ROUTER)
   {
     "enable-media-router",
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
index 33f70c4..e71211a 100644
--- a/chromeos/chromeos_switches.cc
+++ b/chromeos/chromeos_switches.cc
@@ -324,9 +324,6 @@ const char kDisableTimeZoneTrackingOption[] =
 // Disable new GAIA sign-in flow.
 const char kDisableWebviewSigninFlow[] = "disable-webview-signin-flow";
 
-// Enable Chrome OS firewall hole-punching for Chrome Apps.
-const char kEnableFirewallHolePunching[] = "enable-firewall-hole-punching";
-
 // Enables searching for an app that supports a plugged in USB printer. When a
 // user plugs in USB printer, they are shown a notification offering to search
 // Chroem Web Store for an app that has printerProvider permission and can
diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
index 295efc4..767e133 100644
--- a/chromeos/chromeos_switches.h
+++ b/chromeos/chromeos_switches.h
@@ -57,7 +57,6 @@ CHROMEOS_EXPORT extern const char kEafeUrl[];
 CHROMEOS_EXPORT extern const char kEafePath[];
 CHROMEOS_EXPORT extern const char kEnableConsumerManagement[];
 CHROMEOS_EXPORT extern const char kEnableExtensionAssetsSharing[];
-CHROMEOS_EXPORT extern const char kEnableFirewallHolePunching[];
 CHROMEOS_EXPORT extern const char kEnableFirstRunUITransitions[];
 CHROMEOS_EXPORT extern const char kEnableKioskMode[];
 CHROMEOS_EXPORT extern const char kEnableNetworkPortalNotification[];
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.";