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

Unified Diff: chrome/test/ui/ppapi_uitest.cc

Issue 8772041: Remove deprecated TabContentsDelegate::OpenURLFromTab variant (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years 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
« no previous file with comments | « chrome/test/base/testing_browser_process.cc ('k') | chrome/tools/build/win/resedit.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ui/ppapi_uitest.cc
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
index 8446fb300596e7f4f06b33033a1cbaf35f274cc2..201873ad4d59017dd8d8db84e470bed611096edd 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -170,6 +170,8 @@ class PPAPITest : public PPAPITestBase {
pepper_plugin.append(FILE_PATH_LITERAL(";application/x-ppapi-tests"));
launch_arguments_.AppendSwitchNative(switches::kRegisterPepperPlugins,
pepper_plugin);
+ launch_arguments_.AppendSwitchASCII(switches::kAllowNaClSocketAPI,
+ "127.0.0.1");
}
std::string BuildQuery(const std::string& base,
@@ -199,6 +201,8 @@ class PPAPINaClTest : public PPAPITestBase {
// Enable running NaCl outside of the store.
launch_arguments_.AppendSwitch(switches::kEnableNaCl);
+ launch_arguments_.AppendSwitchASCII(switches::kAllowNaClSocketAPI,
+ "127.0.0.1");
}
// Append the correct mode and testcase string
@@ -291,6 +295,20 @@ TEST_PPAPI_NACL_VIA_HTTP(ImageData)
TEST_PPAPI_IN_PROCESS(Buffer)
TEST_PPAPI_OUT_OF_PROCESS(Buffer)
+// TODO(ygorshenin): investigate why
+// TEST_PPAPI_IN_PROCESS(TCPSocketPrivateShared) fails,
+// http://crbug.com/105860.
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(TCPSocketPrivateShared)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(TCPSocketPrivateShared)
+TEST_PPAPI_NACL_VIA_HTTP(TCPSocketPrivateShared)
+
+// TODO(ygorshenin): investigate why
+// TEST_PPAPI_IN_PROCESS(UDPSocketPrivateShared) fails,
+// http://crbug.com/105860.
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(UDPSocketPrivateShared)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(UDPSocketPrivateShared)
+TEST_PPAPI_NACL_VIA_HTTP(UDPSocketPrivateShared)
+
TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader)
TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader)
TEST_PPAPI_NACL_VIA_HTTP(URLLoader)
« no previous file with comments | « chrome/test/base/testing_browser_process.cc ('k') | chrome/tools/build/win/resedit.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698