Chromium Code Reviews| Index: chrome/test/ppapi/ppapi_browsertest.cc |
| diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc |
| index c18180f6417fa66c806d2bcb62e2b9a8b1a50792..b00f4f167cf34b1a03c54fa9419f6b96a173aa5d 100644 |
| --- a/chrome/test/ppapi/ppapi_browsertest.cc |
| +++ b/chrome/test/ppapi/ppapi_browsertest.cc |
| @@ -1461,13 +1461,13 @@ class PackagedAppTest : public ExtensionBrowserTest { |
| explicit PackagedAppTest(const std::string& toolchain) |
| : toolchain_(toolchain) { } |
| - void LaunchTestingApp() { |
| + void LaunchTestingApp(const std::string& extension_path) { |
|
raymes
2015/02/23 00:56:10
nit: extension_dirname?
dmichael (off chromium)
2015/02/23 23:46:38
Done.
|
| base::FilePath data_dir; |
| ASSERT_TRUE(PathService::Get(chrome::DIR_GEN_TEST_DATA, &data_dir)); |
| base::FilePath app_dir = data_dir.AppendASCII("ppapi") |
| .AppendASCII("tests") |
| .AppendASCII("extensions") |
| - .AppendASCII("packaged_app") |
| + .AppendASCII(extension_path) |
| .AppendASCII(toolchain_); |
| const extensions::Extension* extension = LoadExtension(app_dir); |
| @@ -1480,9 +1480,9 @@ class PackagedAppTest : public ExtensionBrowserTest { |
| OpenApplication(params); |
| } |
| - void RunTests() { |
| + void RunTests(const std::string& extension_path) { |
| ExtensionTestMessageListener listener("hello", true); |
| - LaunchTestingApp(); |
| + LaunchTestingApp(extension_path); |
| EXPECT_TRUE(listener.WaitUntilSatisfied()); |
| } |
| protected: |
| @@ -1518,17 +1518,21 @@ class TransitionalNonSfiPackagedAppTest : public NonSfiPackagedAppTest { |
| // Load a packaged app, and wait for it to successfully post a "hello" message |
| // back. |
| IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, SuccessfulLoad) { |
| - RunTests(); |
| + RunTests("packaged_app"); |
| } |
| IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, |
| MAYBE_PNACL_NONSFI(SuccessfulLoad)) { |
| - RunTests(); |
| + RunTests("packaged_app"); |
| } |
| IN_PROC_BROWSER_TEST_F(TransitionalNonSfiPackagedAppTest, |
| MAYBE_PNACL_TRANSITIONAL_NONSFI(SuccessfulLoad)) { |
| - RunTests(); |
| + RunTests("packaged_app"); |
| +} |
| + |
| +IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, SocketPermissions) { |
| + RunTests("socket_permissions"); |
| } |
| class MojoPPAPITest : public InProcessBrowserTest { |