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 "base/path_service.h" | 5 #include "base/path_service.h" |
6 #include "base/test/test_timeouts.h" | 6 #include "base/test/test_timeouts.h" |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 #include "chrome/browser/extensions/extension_browsertest.h" | 8 #include "chrome/browser/extensions/extension_browsertest.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
(...skipping 1443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1454 #if defined(OS_CHROMEOS) | 1454 #if defined(OS_CHROMEOS) |
1455 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1455 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
1456 #endif | 1456 #endif |
1457 | 1457 |
1458 #if !defined(DISABLE_NACL) | 1458 #if !defined(DISABLE_NACL) |
1459 class PackagedAppTest : public ExtensionBrowserTest { | 1459 class PackagedAppTest : public ExtensionBrowserTest { |
1460 public: | 1460 public: |
1461 explicit PackagedAppTest(const std::string& toolchain) | 1461 explicit PackagedAppTest(const std::string& toolchain) |
1462 : toolchain_(toolchain) { } | 1462 : toolchain_(toolchain) { } |
1463 | 1463 |
1464 void LaunchTestingApp() { | 1464 void LaunchTestingApp(const std::string& extension_dirname) { |
1465 base::FilePath data_dir; | 1465 base::FilePath data_dir; |
1466 ASSERT_TRUE(PathService::Get(chrome::DIR_GEN_TEST_DATA, &data_dir)); | 1466 ASSERT_TRUE(PathService::Get(chrome::DIR_GEN_TEST_DATA, &data_dir)); |
1467 base::FilePath app_dir = data_dir.AppendASCII("ppapi") | 1467 base::FilePath app_dir = data_dir.AppendASCII("ppapi") |
1468 .AppendASCII("tests") | 1468 .AppendASCII("tests") |
1469 .AppendASCII("extensions") | 1469 .AppendASCII("extensions") |
1470 .AppendASCII("packaged_app") | 1470 .AppendASCII(extension_dirname) |
1471 .AppendASCII(toolchain_); | 1471 .AppendASCII(toolchain_); |
1472 | 1472 |
1473 const extensions::Extension* extension = LoadExtension(app_dir); | 1473 const extensions::Extension* extension = LoadExtension(app_dir); |
1474 ASSERT_TRUE(extension); | 1474 ASSERT_TRUE(extension); |
1475 | 1475 |
1476 AppLaunchParams params(browser()->profile(), extension, | 1476 AppLaunchParams params(browser()->profile(), extension, |
1477 extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW, | 1477 extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW, |
1478 extensions::SOURCE_TEST); | 1478 extensions::SOURCE_TEST); |
1479 params.command_line = *base::CommandLine::ForCurrentProcess(); | 1479 params.command_line = *base::CommandLine::ForCurrentProcess(); |
1480 OpenApplication(params); | 1480 OpenApplication(params); |
1481 } | 1481 } |
1482 | 1482 |
1483 void RunTests() { | 1483 void RunTests(const std::string& extension_dirname) { |
1484 ExtensionTestMessageListener listener("hello", true); | 1484 ExtensionTestMessageListener listener("PASS", true); |
1485 LaunchTestingApp(); | 1485 LaunchTestingApp(extension_dirname); |
1486 EXPECT_TRUE(listener.WaitUntilSatisfied()); | 1486 EXPECT_TRUE(listener.WaitUntilSatisfied()); |
1487 } | 1487 } |
1488 protected: | 1488 protected: |
1489 std::string toolchain_; | 1489 std::string toolchain_; |
1490 }; | 1490 }; |
1491 | 1491 |
1492 class NewlibPackagedAppTest : public PackagedAppTest { | 1492 class NewlibPackagedAppTest : public PackagedAppTest { |
1493 public: | 1493 public: |
1494 NewlibPackagedAppTest() : PackagedAppTest("newlib") { } | 1494 NewlibPackagedAppTest() : PackagedAppTest("newlib") { } |
1495 }; | 1495 }; |
(...skipping 15 matching lines...) Expand all Loading... |
1511 public: | 1511 public: |
1512 void SetUpCommandLine(base::CommandLine* command_line) override { | 1512 void SetUpCommandLine(base::CommandLine* command_line) override { |
1513 NonSfiPackagedAppTest::SetUpCommandLine(command_line); | 1513 NonSfiPackagedAppTest::SetUpCommandLine(command_line); |
1514 command_line->AppendSwitch(switches::kUseNaClHelperNonSfi); | 1514 command_line->AppendSwitch(switches::kUseNaClHelperNonSfi); |
1515 } | 1515 } |
1516 }; | 1516 }; |
1517 | 1517 |
1518 // Load a packaged app, and wait for it to successfully post a "hello" message | 1518 // Load a packaged app, and wait for it to successfully post a "hello" message |
1519 // back. | 1519 // back. |
1520 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, SuccessfulLoad) { | 1520 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, SuccessfulLoad) { |
1521 RunTests(); | 1521 RunTests("packaged_app"); |
1522 } | 1522 } |
1523 | 1523 |
1524 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, | 1524 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, |
1525 MAYBE_PNACL_NONSFI(SuccessfulLoad)) { | 1525 MAYBE_PNACL_NONSFI(SuccessfulLoad)) { |
1526 RunTests(); | 1526 RunTests("packaged_app"); |
1527 } | 1527 } |
1528 | 1528 |
1529 IN_PROC_BROWSER_TEST_F(TransitionalNonSfiPackagedAppTest, | 1529 IN_PROC_BROWSER_TEST_F(TransitionalNonSfiPackagedAppTest, |
1530 MAYBE_PNACL_TRANSITIONAL_NONSFI(SuccessfulLoad)) { | 1530 MAYBE_PNACL_TRANSITIONAL_NONSFI(SuccessfulLoad)) { |
1531 RunTests(); | 1531 RunTests("packaged_app"); |
| 1532 } |
| 1533 |
| 1534 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, SocketPermissions) { |
| 1535 RunTests("socket_permissions"); |
1532 } | 1536 } |
1533 | 1537 |
1534 class MojoPPAPITest : public InProcessBrowserTest { | 1538 class MojoPPAPITest : public InProcessBrowserTest { |
1535 public: | 1539 public: |
1536 MojoPPAPITest() : InProcessBrowserTest() { } | 1540 MojoPPAPITest() : InProcessBrowserTest() { } |
1537 virtual ~MojoPPAPITest() { } | 1541 virtual ~MojoPPAPITest() { } |
1538 | 1542 |
1539 void RunTestInternal() { | 1543 void RunTestInternal() { |
1540 base::FilePath document_root; | 1544 base::FilePath document_root; |
1541 ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&document_root)); | 1545 ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&document_root)); |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1580 #endif | 1584 #endif |
1581 | 1585 |
1582 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(Mojo)) { | 1586 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(Mojo)) { |
1583 RunTest(); | 1587 RunTest(); |
1584 } | 1588 } |
1585 | 1589 |
1586 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(MojoFailsWithoutFlag)) { | 1590 IN_PROC_BROWSER_TEST_F(MojoPPAPITest, MAYBE_MOJO(MojoFailsWithoutFlag)) { |
1587 RunTestWithoutFlag(); | 1591 RunTestWithoutFlag(); |
1588 } | 1592 } |
1589 #endif | 1593 #endif |
OLD | NEW |