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

Unified Diff: mojo/edk/embedder/embedder_unittest.cc

Issue 2504193005: Revert of Mojo EDK: Speculatively disable peer connection tests on Android (Closed)
Patch Set: Created 4 years, 1 month 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/embedder/embedder_unittest.cc
diff --git a/mojo/edk/embedder/embedder_unittest.cc b/mojo/edk/embedder/embedder_unittest.cc
index aea0f078079efa5a322737f52c050e573a664751..4521f8037ed2d44c3c1c67c5b96ea828b1fb5988 100644
--- a/mojo/edk/embedder/embedder_unittest.cc
+++ b/mojo/edk/embedder/embedder_unittest.cc
@@ -579,13 +579,7 @@
*output = CreateClientHandle(named_handle);
}
-#if defined(OS_ANDROID)
-// Disabled on Android as suspected source of flake. https://crbug.com/666356.
-#define MAYBE_ClosePendingPeerConnection DISABLED_ClosePendingPeerConnection
-#else
-#define MAYBE_ClosePendingPeerConnection ClosePendingPeerConnection
-#endif
-TEST_F(EmbedderTest, MAYBE_ClosePendingPeerConnection) {
+TEST_F(EmbedderTest, ClosePendingPeerConnection) {
NamedPlatformHandle named_handle = GenerateChannelName();
std::string peer_token = GenerateRandomToken();
ScopedMessagePipeHandle server_pipe =
@@ -611,13 +605,7 @@
#if !defined(OS_IOS)
-#if defined(OS_ANDROID)
-// Disabled on Android as suspected source of flake. https://crbug.com/666356.
-#define MAYBE_ClosePipeToConnectedPeer DISABLED_ClosePipeToConnectedPeer
-#else
-#define MAYBE_ClosePipeToConnectedPeer ClosePipeToConnectedPeer
-#endif
-TEST_F(EmbedderTest, MAYBE_ClosePipeToConnectedPeer) {
+TEST_F(EmbedderTest, ClosePipeToConnectedPeer) {
set_launch_type(LaunchType::PEER);
auto& controller = StartClient("ClosePipeToConnectedPeerClient");
MojoHandle server_mp = controller.pipe();
@@ -648,13 +636,7 @@
MOJO_DEADLINE_INDEFINITE, nullptr));
}
-#if defined(OS_ANDROID)
-// Disabled on Android as suspected source of flake. https://crbug.com/666356.
-#define MAYBE_ClosePipeToConnectingPeer DISABLED_ClosePipeToConnectingPeer
-#else
-#define MAYBE_ClosePipeToConnectingPeer ClosePipeToConnectingPeer
-#endif
-TEST_F(EmbedderTest, MAYBE_ClosePipeToConnectingPeer) {
+TEST_F(EmbedderTest, ClosePipeToConnectingPeer) {
set_launch_type(LaunchType::PEER);
auto& controller = StartClient("ClosePipeToConnectingPeerClient");
controller.ClosePeerConnection();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698