summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-19 22:29:45 +0000
committerbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-19 22:29:45 +0000
commit7e6d5ba7669df85de4e9d3b3fe9431520b0a34b4 (patch)
tree99580a5b415543f75bfb5cdbceb7e4a79ec2fadc /ppapi
parent99523a485678302741363518ed6f9b89e61eaa44 (diff)
downloadchromium_src-7e6d5ba7669df85de4e9d3b3fe9431520b0a34b4.zip
chromium_src-7e6d5ba7669df85de4e9d3b3fe9431520b0a34b4.tar.gz
chromium_src-7e6d5ba7669df85de4e9d3b3fe9431520b0a34b4.tar.bz2
Use the --enable_sockets flag on browser_tester, when testing NaCl SDK.
This reverts r217693 which enables sockets unconditionally, and only enables it for the NaCl SDK tests. BUG=none R=bradnelson@chromium.org, bradnelson@google.com Review URL: https://codereview.chromium.org/23259003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rwxr-xr-xppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py b/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py
index 29a68972..c8842be 100755
--- a/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py
+++ b/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py
@@ -290,8 +290,7 @@ class ChromeLauncher(BrowserLauncher):
# blacklisted port. To work around this, the tester whitelists
# whatever port it is using.
'--explicitly-allowed-ports=%d' % port,
- '--user-data-dir=%s' % self.profile,
- '--allow-nacl-socket-api=%s' % host]
+ '--user-data-dir=%s' % self.profile]
# Log network requests to assist debugging.
cmd.append('--log-net-log=%s' % self.NetLogName())
if self.options.ppapi_plugin is None: