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

Side by Side Diff: chrome/test/ppapi/ppapi_test.cc

Issue 19079002: Enable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/test/ppapi/ppapi_test.h" 5 #include "chrome/test/ppapi/ppapi_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 command_line->AppendSwitch(switches::kUseFakeUIForMediaStream); 320 command_line->AppendSwitch(switches::kUseFakeUIForMediaStream);
321 } 321 }
322 322
323 void PPAPINaClTest::SetUpCommandLine(CommandLine* command_line) { 323 void PPAPINaClTest::SetUpCommandLine(CommandLine* command_line) {
324 PPAPITestBase::SetUpCommandLine(command_line); 324 PPAPITestBase::SetUpCommandLine(command_line);
325 325
326 base::FilePath plugin_lib; 326 base::FilePath plugin_lib;
327 EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib)); 327 EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));
328 EXPECT_TRUE(base::PathExists(plugin_lib)); 328 EXPECT_TRUE(base::PathExists(plugin_lib));
329 329
330 // Enable running NaCl outside of the store. 330 // Enable running NaCl outside of the store.
Mark Seaborn 2013/07/18 01:25:52 Update to "Enable running non-PNaCl NaCl"? Or som
sehr 2013/07/22 23:06:50 Done, but by adding (non-portable), as we don't ha
331 command_line->AppendSwitch(switches::kEnableNaCl); 331 command_line->AppendSwitch(switches::kEnableNaCl);
332 command_line->AppendSwitch(switches::kEnablePnacl);
333 command_line->AppendSwitchASCII(switches::kAllowNaClSocketAPI, "127.0.0.1"); 332 command_line->AppendSwitchASCII(switches::kAllowNaClSocketAPI, "127.0.0.1");
334 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); 333 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
335 command_line->AppendSwitch(switches::kUseFakeUIForMediaStream); 334 command_line->AppendSwitch(switches::kUseFakeUIForMediaStream);
336 } 335 }
337 336
338 // Append the correct mode and testcase string 337 // Append the correct mode and testcase string
339 std::string PPAPINaClNewlibTest::BuildQuery(const std::string& base, 338 std::string PPAPINaClNewlibTest::BuildQuery(const std::string& base,
340 const std::string& test_case) { 339 const std::string& test_case) {
341 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), 340 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(),
342 test_case.c_str()); 341 test_case.c_str());
(...skipping 14 matching lines...) Expand all
357 } 356 }
358 357
359 void PPAPINaClTestDisallowedSockets::SetUpCommandLine( 358 void PPAPINaClTestDisallowedSockets::SetUpCommandLine(
360 CommandLine* command_line) { 359 CommandLine* command_line) {
361 PPAPITestBase::SetUpCommandLine(command_line); 360 PPAPITestBase::SetUpCommandLine(command_line);
362 361
363 base::FilePath plugin_lib; 362 base::FilePath plugin_lib;
364 EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib)); 363 EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));
365 EXPECT_TRUE(base::PathExists(plugin_lib)); 364 EXPECT_TRUE(base::PathExists(plugin_lib));
366 365
367 // Enable running NaCl outside of the store. 366 // Enable running NaCl outside of the store.
Mark Seaborn 2013/07/18 01:25:52 Ditto
sehr 2013/07/22 23:06:50 Ditto. On 2013/07/18 01:25:52, Mark Seaborn wrote:
368 command_line->AppendSwitch(switches::kEnableNaCl); 367 command_line->AppendSwitch(switches::kEnableNaCl);
369 command_line->AppendSwitch(switches::kEnablePnacl);
370 } 368 }
371 369
372 // Append the correct mode and testcase string 370 // Append the correct mode and testcase string
373 std::string PPAPINaClTestDisallowedSockets::BuildQuery( 371 std::string PPAPINaClTestDisallowedSockets::BuildQuery(
374 const std::string& base, 372 const std::string& base,
375 const std::string& test_case) { 373 const std::string& test_case) {
376 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), 374 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(),
377 test_case.c_str()); 375 test_case.c_str());
378 } 376 }
379 377
380 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { 378 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() {
381 // The default content setting for the PPAPI broker is ASK. We purposefully 379 // The default content setting for the PPAPI broker is ASK. We purposefully
382 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. 380 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way.
383 } 381 }
OLDNEW
« chrome/test/nacl/nacl_browsertest_util.h ('K') | « chrome/test/nacl/nacl_browsertest_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698