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

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

Issue 9704080: HostResolver is exposed to Native Client. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Sync. Created 8 years, 9 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
« no previous file with comments | « no previous file | ppapi/native_client/src/shared/ppapi_proxy/browser_globals.h » ('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 cd7b190af2e5a2df9f709b439f974183f1d28006..020c390a7e29ad315953500475c867c6325ce657 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -474,15 +474,37 @@ TEST_PPAPI_NACL_VIA_HTTP_DISALLOWED_SOCKETS(UDPSocketPrivateDisallowed)
TEST_PPAPI_IN_PROCESS_VIA_HTTP(TCPServerSocketPrivate)
TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(TCPServerSocketPrivate)
-TEST_PPAPI_NACL_VIA_HTTP(TCPServerSocketPrivate)
+// TODO(ygorshenin): http://crbug.com/116480.
+TEST_PPAPI_NACL_VIA_HTTP(DISABLED_TCPServerSocketPrivate)
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(HostResolverPrivate_Empty)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(HostResolverPrivate_Create)
TEST_PPAPI_IN_PROCESS_VIA_HTTP(HostResolverPrivate_Resolve)
TEST_PPAPI_IN_PROCESS_VIA_HTTP(HostResolverPrivate_ResolveIPV4)
-TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(HostResolverPrivate_Empty)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(HostResolverPrivate_Create)
TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(HostResolverPrivate_Resolve)
TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(HostResolverPrivate_ResolveIPV4)
+// Undeterministically can't be found on Windows. http://crbug.com/119260
+#if defined(OS_WIN)
+#define MAYBE_HostResolverPrivate_Create \
+ DISABLED_HostResolverPrivate_Create
+#define MAYBE_HostResolverPrivate_Resolve \
+ DISABLED_HostResolverPrivate_Resolve
+#define MAYBE_HostResolverPrivate_ResolveIPV4 \
+ DISABLED_HostResolverPrivate_ResolveIPV4
+#else
+#define MAYBE_HostResolverPrivate_Create \
+ HostResolverPrivate_Create
+#define MAYBE_HostResolverPrivate_Resolve \
+ HostResolverPrivate_Resolve
+#define MAYBE_HostResolverPrivate_ResolveIPV4 \
+ HostResolverPrivate_ResolveIPV4
+#endif
+
+TEST_PPAPI_NACL_VIA_HTTP(MAYBE_HostResolverPrivate_Create)
+TEST_PPAPI_NACL_VIA_HTTP(MAYBE_HostResolverPrivate_Resolve)
+TEST_PPAPI_NACL_VIA_HTTP(MAYBE_HostResolverPrivate_ResolveIPV4)
+
// URLLoader tests.
TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_BasicGET)
TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_BasicPOST)
@@ -767,13 +789,30 @@ TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate_GetFamily)
TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate_GetPort)
TEST_PPAPI_OUT_OF_PROCESS(NetAddressPrivate_GetAddress)
+// Frequently timing out on Windows. http://crbug.com/115440
+#if defined(OS_WIN)
+#define MAYBE_NetAddressPrivateUntrusted_Describe \
+ DISABLED_NetAddressPrivateUntrusted_Describe
+#define MAYBE_NetAddressPrivateUntrusted_ReplacePort \
+ DISABLED_NetAddressPrivateUntrusted_ReplacePort
+#define MAYBE_NetAddressPrivateUntrusted_GetPort \
+ DISABLED_NetAddressPrivateUntrusted_GetPort
+#else
+#define MAYBE_NetAddressPrivateUntrusted_Describe \
+ NetAddressPrivateUntrusted_Describe
+#define MAYBE_NetAddressPrivateUntrusted_ReplacePort \
+ NetAddressPrivateUntrusted_ReplacePort
+#define MAYBE_NetAddressPrivateUntrusted_GetPort \
+ NetAddressPrivateUntrusted_GetPort
+#endif
+
TEST_PPAPI_NACL_VIA_HTTP(NetAddressPrivateUntrusted_AreEqual)
TEST_PPAPI_NACL_VIA_HTTP(NetAddressPrivateUntrusted_AreHostsEqual)
-TEST_PPAPI_NACL_VIA_HTTP(NetAddressPrivateUntrusted_Describe)
-TEST_PPAPI_NACL_VIA_HTTP(NetAddressPrivateUntrusted_ReplacePort)
+TEST_PPAPI_NACL_VIA_HTTP(MAYBE_NetAddressPrivateUntrusted_Describe)
+TEST_PPAPI_NACL_VIA_HTTP(MAYBE_NetAddressPrivateUntrusted_ReplacePort)
TEST_PPAPI_NACL_VIA_HTTP(NetAddressPrivateUntrusted_GetAnyAddress)
TEST_PPAPI_NACL_VIA_HTTP(NetAddressPrivateUntrusted_GetFamily)
-TEST_PPAPI_NACL_VIA_HTTP(NetAddressPrivateUntrusted_GetPort)
+TEST_PPAPI_NACL_VIA_HTTP(MAYBE_NetAddressPrivateUntrusted_GetPort)
TEST_PPAPI_NACL_VIA_HTTP(NetAddressPrivateUntrusted_GetAddress)
TEST_PPAPI_IN_PROCESS(NetworkMonitorPrivate_Basic)
« no previous file with comments | « no previous file | ppapi/native_client/src/shared/ppapi_proxy/browser_globals.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698