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

Unified Diff: chrome/test/ppapi/ppapi_test.cc

Issue 22839005: disable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Code review changes Created 7 years, 4 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 | « chrome/test/nacl/nacl_browsertest_util.cc ('k') | ppapi/native_client/src/trusted/plugin/plugin.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ppapi/ppapi_test.cc
diff --git a/chrome/test/ppapi/ppapi_test.cc b/chrome/test/ppapi/ppapi_test.cc
index 1c912a13e3308fe6a12941c87d061340c5083da0..1095da06c472de0f86d83f871e947a0841866c98 100644
--- a/chrome/test/ppapi/ppapi_test.cc
+++ b/chrome/test/ppapi/ppapi_test.cc
@@ -338,8 +338,9 @@ void PPAPINaClTest::SetUpCommandLine(CommandLine* command_line) {
EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));
EXPECT_TRUE(base::PathExists(plugin_lib));
- // Enable running (non-portable) NaCl outside of the Chrome web store.
+ // Enable running NaCl outside of the store.
command_line->AppendSwitch(switches::kEnableNaCl);
+ command_line->AppendSwitch(switches::kEnablePnacl);
command_line->AppendSwitchASCII(switches::kAllowNaClSocketAPI, "127.0.0.1");
command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
command_line->AppendSwitch(switches::kUseFakeUIForMediaStream);
@@ -374,8 +375,9 @@ void PPAPINaClTestDisallowedSockets::SetUpCommandLine(
EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));
EXPECT_TRUE(base::PathExists(plugin_lib));
- // Enable running (non-portable) NaCl outside of the Chrome web store.
+ // Enable running NaCl outside of the store.
command_line->AppendSwitch(switches::kEnableNaCl);
+ command_line->AppendSwitch(switches::kEnablePnacl);
}
// Append the correct mode and testcase string
« no previous file with comments | « chrome/test/nacl/nacl_browsertest_util.cc ('k') | ppapi/native_client/src/trusted/plugin/plugin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698