summaryrefslogtreecommitdiffstats
path: root/chrome/test/nacl
diff options
context:
space:
mode:
authorgregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-26 21:44:43 +0000
committergregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-26 21:44:43 +0000
commit3213339b064c87a06785145cbe86de65cf42fd6e (patch)
tree8dd86aa67e1b303c1183068cbf8cf18ed33b9a7a /chrome/test/nacl
parent37ad8892fe9576eef898295e50e7d42b5d7a3e27 (diff)
downloadchromium_src-3213339b064c87a06785145cbe86de65cf42fd6e.zip
chromium_src-3213339b064c87a06785145cbe86de65cf42fd6e.tar.gz
chromium_src-3213339b064c87a06785145cbe86de65cf42fd6e.tar.bz2
Add --enable-nacl switch that enables both NaCl and GPU plugins.
BUG=38554 TEST=nacl_ui_tests Review URL: http://codereview.chromium.org/1445001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42829 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl')
-rw-r--r--chrome/test/nacl/nacl_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/nacl/nacl_test.cc b/chrome/test/nacl/nacl_test.cc
index 2d2b8f6..4d5d749 100644
--- a/chrome/test/nacl/nacl_test.cc
+++ b/chrome/test/nacl/nacl_test.cc
@@ -56,7 +56,7 @@ const FilePath::CharType kServerHtmlFileName[] =
NaClTest::NaClTest()
: UITest() {
- launch_arguments_.AppendSwitch(switches::kInternalNaCl);
+ launch_arguments_.AppendSwitch(switches::kEnableNaCl);
#if defined(OS_MACOSX)
launch_arguments_.AppendSwitch(switches::kNoSandbox);
#endif