Index: chrome/test/ppapi/ppapi_browsertest.cc |
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc |
index 5da5ea5814fd1a41b741720592a21619b61f4622..be30d33bd8236b3e4051617e407e7a500f33c17d 100644 |
--- a/chrome/test/ppapi/ppapi_browsertest.cc |
+++ b/chrome/test/ppapi/ppapi_browsertest.cc |
@@ -807,7 +807,36 @@ TEST_PPAPI_OUT_OF_PROCESS(X509CertificatePrivate) |
TEST_PPAPI_IN_PROCESS(UMA) |
// NetAddress tests |
-IN_PROC_BROWSER_TEST_F(PPAPITest, NetAddress) { |
+IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetAddress) { |
+ RunTestViaHTTP( |
+ LIST_TEST(NetAddress_IPv4Address) |
+ LIST_TEST(NetAddress_IPv6Address) |
+ LIST_TEST(NetAddress_DescribeAsString) |
+ ); |
+} |
+IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetAddress) { |
+ RunTestViaHTTP( |
+ LIST_TEST(NetAddress_IPv4Address) |
+ LIST_TEST(NetAddress_IPv6Address) |
+ LIST_TEST(NetAddress_DescribeAsString) |
+ ); |
+} |
+IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(NetAddress)) { |
+ RunTestViaHTTP( |
+ LIST_TEST(NetAddress_IPv4Address) |
+ LIST_TEST(NetAddress_IPv6Address) |
+ LIST_TEST(NetAddress_DescribeAsString) |
+ ); |
+} |
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetAddress) { |
+ RunTestViaHTTP( |
+ LIST_TEST(NetAddress_IPv4Address) |
+ LIST_TEST(NetAddress_IPv6Address) |
+ LIST_TEST(NetAddress_DescribeAsString) |
+ ); |
+} |
+ |
+IN_PROC_BROWSER_TEST_F(PPAPITest, NetAddressPrivate) { |
RunTestViaHTTP( |
LIST_TEST(NetAddressPrivate_AreEqual) |
LIST_TEST(NetAddressPrivate_AreHostsEqual) |
@@ -821,7 +850,7 @@ IN_PROC_BROWSER_TEST_F(PPAPITest, NetAddress) { |
LIST_TEST(NetAddressPrivate_GetScopeID) |
); |
} |
-IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetAddress) { |
+IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetAddressPrivate) { |
RunTestViaHTTP( |
LIST_TEST(NetAddressPrivate_AreEqual) |
LIST_TEST(NetAddressPrivate_AreHostsEqual) |
@@ -835,7 +864,7 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetAddress) { |
LIST_TEST(NetAddressPrivate_GetScopeID) |
); |
} |
-IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetAddress) { |
+IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetAddressPrivate) { |
RunTestViaHTTP( |
LIST_TEST(NetAddressPrivateUntrusted_AreEqual) |
LIST_TEST(NetAddressPrivateUntrusted_AreHostsEqual) |
@@ -847,7 +876,7 @@ IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetAddress) { |
LIST_TEST(NetAddressPrivateUntrusted_GetAddress) |
); |
} |
-IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(NetAddress)) { |
+IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(NetAddressPrivate)) { |
RunTestViaHTTP( |
LIST_TEST(NetAddressPrivateUntrusted_AreEqual) |
LIST_TEST(NetAddressPrivateUntrusted_AreHostsEqual) |
@@ -859,7 +888,7 @@ IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(NetAddress)) { |
LIST_TEST(NetAddressPrivateUntrusted_GetAddress) |
); |
} |
-IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetAddress) { |
+IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetAddressPrivate) { |
RunTestViaHTTP( |
LIST_TEST(NetAddressPrivateUntrusted_AreEqual) |
LIST_TEST(NetAddressPrivateUntrusted_AreHostsEqual) |