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

Unified Diff: chrome/test/ppapi/ppapi_browsertest.cc

Issue 949543002: PPAPI: Add test for new-style permission for Sockets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
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..e92e4bf6c8b8b081d80199958cf91a3eb417d91f 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_dirname) {
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_dirname)
.AppendASCII(toolchain_);
const extensions::Extension* extension = LoadExtension(app_dir);
@@ -1480,9 +1480,9 @@ class PackagedAppTest : public ExtensionBrowserTest {
OpenApplication(params);
}
- void RunTests() {
- ExtensionTestMessageListener listener("hello", true);
- LaunchTestingApp();
+ void RunTests(const std::string& extension_dirname) {
+ ExtensionTestMessageListener listener("PASS", true);
+ LaunchTestingApp(extension_dirname);
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 {

Powered by Google App Engine
This is Rietveld 408576698