| 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/files/file_util.h" | 8 #include "base/files/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 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 392 test_case.c_str()); | 392 test_case.c_str()); |
| 393 } | 393 } |
| 394 | 394 |
| 395 void PPAPIPrivateNaClNewlibTest::SetUpCommandLine( | 395 void PPAPIPrivateNaClNewlibTest::SetUpCommandLine( |
| 396 base::CommandLine* command_line) { | 396 base::CommandLine* command_line) { |
| 397 PPAPINaClNewlibTest::SetUpCommandLine(command_line); | 397 PPAPINaClNewlibTest::SetUpCommandLine(command_line); |
| 398 AddPrivateSwitches(command_line); | 398 AddPrivateSwitches(command_line); |
| 399 } | 399 } |
| 400 | 400 |
| 401 // Append the correct mode and testcase string | 401 // Append the correct mode and testcase string |
| 402 std::string PPAPINaClGLibcTest::BuildQuery(const std::string& base, | |
| 403 const std::string& test_case) { | |
| 404 return base::StringPrintf("%smode=nacl_glibc&testcase=%s", base.c_str(), | |
| 405 test_case.c_str()); | |
| 406 } | |
| 407 | |
| 408 void PPAPIPrivateNaClGLibcTest::SetUpCommandLine( | |
| 409 base::CommandLine* command_line) { | |
| 410 PPAPINaClGLibcTest::SetUpCommandLine(command_line); | |
| 411 AddPrivateSwitches(command_line); | |
| 412 } | |
| 413 | |
| 414 // Append the correct mode and testcase string | |
| 415 std::string PPAPINaClPNaClTest::BuildQuery(const std::string& base, | 402 std::string PPAPINaClPNaClTest::BuildQuery(const std::string& base, |
| 416 const std::string& test_case) { | 403 const std::string& test_case) { |
| 417 return base::StringPrintf("%smode=nacl_pnacl&testcase=%s", base.c_str(), | 404 return base::StringPrintf("%smode=nacl_pnacl&testcase=%s", base.c_str(), |
| 418 test_case.c_str()); | 405 test_case.c_str()); |
| 419 } | 406 } |
| 420 | 407 |
| 421 void PPAPIPrivateNaClPNaClTest::SetUpCommandLine( | 408 void PPAPIPrivateNaClPNaClTest::SetUpCommandLine( |
| 422 base::CommandLine* command_line) { | 409 base::CommandLine* command_line) { |
| 423 PPAPINaClPNaClTest::SetUpCommandLine(command_line); | 410 PPAPINaClPNaClTest::SetUpCommandLine(command_line); |
| 424 AddPrivateSwitches(command_line); | 411 AddPrivateSwitches(command_line); |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 474 const std::string& base, | 461 const std::string& base, |
| 475 const std::string& test_case) { | 462 const std::string& test_case) { |
| 476 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), | 463 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), |
| 477 test_case.c_str()); | 464 test_case.c_str()); |
| 478 } | 465 } |
| 479 | 466 |
| 480 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { | 467 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { |
| 481 // The default content setting for the PPAPI broker is ASK. We purposefully | 468 // The default content setting for the PPAPI broker is ASK. We purposefully |
| 482 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. | 469 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. |
| 483 } | 470 } |
| OLD | NEW |