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

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

Issue 397243004: Pepper: Remove trusted plugin loadable module. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: upload for recommit after chromite fix Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/nacl/nacl_browsertest_util.cc ('k') | chrome/tools/build/chromeos/FILES.cfg » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 335
336 // Enable running (non-portable) NaCl outside of the Chrome web store. 336 // Enable running (non-portable) NaCl outside of the Chrome web store.
337 command_line->AppendSwitch(switches::kEnableNaCl); 337 command_line->AppendSwitch(switches::kEnableNaCl);
338 command_line->AppendSwitchASCII(switches::kAllowNaClSocketAPI, "127.0.0.1"); 338 command_line->AppendSwitchASCII(switches::kAllowNaClSocketAPI, "127.0.0.1");
339 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); 339 command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
340 command_line->AppendSwitch(switches::kUseFakeUIForMediaStream); 340 command_line->AppendSwitch(switches::kUseFakeUIForMediaStream);
341 #endif 341 #endif
342 } 342 }
343 343
344 void PPAPINaClTest::SetUpOnMainThread() { 344 void PPAPINaClTest::SetUpOnMainThread() {
345 base::FilePath plugin_lib;
346 EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));
347 EXPECT_TRUE(base::PathExists(plugin_lib));
348 } 345 }
349 346
350 void PPAPINaClTest::RunTest(const std::string& test_case) { 347 void PPAPINaClTest::RunTest(const std::string& test_case) {
351 #if !defined(DISABLE_NACL) 348 #if !defined(DISABLE_NACL)
352 PPAPITestBase::RunTest(test_case); 349 PPAPITestBase::RunTest(test_case);
353 #endif 350 #endif
354 } 351 }
355 352
356 void PPAPINaClTest::RunTestViaHTTP(const std::string& test_case) { 353 void PPAPINaClTest::RunTestViaHTTP(const std::string& test_case) {
357 #if !defined(DISABLE_NACL) 354 #if !defined(DISABLE_NACL)
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 std::string PPAPINaClTestDisallowedSockets::BuildQuery( 454 std::string PPAPINaClTestDisallowedSockets::BuildQuery(
458 const std::string& base, 455 const std::string& base,
459 const std::string& test_case) { 456 const std::string& test_case) {
460 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), 457 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(),
461 test_case.c_str()); 458 test_case.c_str());
462 } 459 }
463 460
464 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { 461 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() {
465 // The default content setting for the PPAPI broker is ASK. We purposefully 462 // The default content setting for the PPAPI broker is ASK. We purposefully
466 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. 463 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way.
467
468 base::FilePath plugin_lib;
469 EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));
470 EXPECT_TRUE(base::PathExists(plugin_lib));
471 } 464 }
OLDNEW
« no previous file with comments | « chrome/test/nacl/nacl_browsertest_util.cc ('k') | chrome/tools/build/chromeos/FILES.cfg » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698