| OLD | NEW |
| 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 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 419 } | 419 } |
| 420 | 420 |
| 421 void PPAPIPrivateNaClPNaClTest::SetUpCommandLine( | 421 void PPAPIPrivateNaClPNaClTest::SetUpCommandLine( |
| 422 base::CommandLine* command_line) { | 422 base::CommandLine* command_line) { |
| 423 PPAPINaClPNaClTest::SetUpCommandLine(command_line); | 423 PPAPINaClPNaClTest::SetUpCommandLine(command_line); |
| 424 AddPrivateSwitches(command_line); | 424 AddPrivateSwitches(command_line); |
| 425 } | 425 } |
| 426 | 426 |
| 427 void PPAPINaClPNaClNonSfiTest::SetUpCommandLine( | 427 void PPAPINaClPNaClNonSfiTest::SetUpCommandLine( |
| 428 base::CommandLine* command_line) { | 428 base::CommandLine* command_line) { |
| 429 #if !defined(DISABLE_NACL) |
| 429 PPAPINaClTest::SetUpCommandLine(command_line); | 430 PPAPINaClTest::SetUpCommandLine(command_line); |
| 430 command_line->AppendSwitch(switches::kEnableNaClNonSfiMode); | 431 command_line->AppendSwitch(switches::kEnableNaClNonSfiMode); |
| 432 #endif |
| 431 } | 433 } |
| 432 | 434 |
| 433 std::string PPAPINaClPNaClNonSfiTest::BuildQuery( | 435 std::string PPAPINaClPNaClNonSfiTest::BuildQuery( |
| 434 const std::string& base, | 436 const std::string& base, |
| 435 const std::string& test_case) { | 437 const std::string& test_case) { |
| 436 return base::StringPrintf("%smode=nacl_pnacl_nonsfi&testcase=%s", | 438 return base::StringPrintf("%smode=nacl_pnacl_nonsfi&testcase=%s", |
| 437 base.c_str(), test_case.c_str()); | 439 base.c_str(), test_case.c_str()); |
| 438 } | 440 } |
| 439 | 441 |
| 440 void PPAPIPrivateNaClPNaClNonSfiTest::SetUpCommandLine( | 442 void PPAPIPrivateNaClPNaClNonSfiTest::SetUpCommandLine( |
| (...skipping 19 matching lines...) Expand all Loading... |
| 460 } | 462 } |
| 461 | 463 |
| 462 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { | 464 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { |
| 463 // The default content setting for the PPAPI broker is ASK. We purposefully | 465 // The default content setting for the PPAPI broker is ASK. We purposefully |
| 464 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. | 466 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. |
| 465 | 467 |
| 466 base::FilePath plugin_lib; | 468 base::FilePath plugin_lib; |
| 467 EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib)); | 469 EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib)); |
| 468 EXPECT_TRUE(base::PathExists(plugin_lib)); | 470 EXPECT_TRUE(base::PathExists(plugin_lib)); |
| 469 } | 471 } |
| OLD | NEW |