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

Unified Diff: base/sync_socket_unittest.cc

Issue 1306893002: Disable CancelableSyncSocket.CancelReceiveShutdown on iOS 7 devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/sync_socket_unittest.cc
diff --git a/base/sync_socket_unittest.cc b/base/sync_socket_unittest.cc
index 7c8c97cbc19328bd3a14ffb1b99e861179dc5fae..ff9b8bc8c2f0c7a932d034da2080335e19a7481c 100644
--- a/base/sync_socket_unittest.cc
+++ b/base/sync_socket_unittest.cc
@@ -3,6 +3,10 @@
// found in the LICENSE file.
#include "base/basictypes.h"
+// TODO(ellyjones): Remove once http://crbug.com/523296 is fixed.
+#if defined(OS_IOS) && !TARGET_IPHONE_SIMULATOR
+#include "base/ios/ios_util.h"
+#endif
#include "base/sync_socket.h"
#include "base/threading/simple_thread.h"
#include "base/time/time.h"
@@ -114,6 +118,11 @@ TEST(CancelableSyncSocket, ClonedSendReceivePeek) {
}
TEST(CancelableSyncSocket, CancelReceiveShutdown) {
+// TODO(ellyjones): This test fails on iOS 7 devices. http://crbug.com/523296
+#if defined(OS_IOS) && !TARGET_IPHONE_SIMULATOR
+ if (!base::ios::IsRunningOnIOS8OrLater())
+ return;
+#endif
base::CancelableSyncSocket socket_a, socket_b;
ASSERT_TRUE(base::CancelableSyncSocket::CreatePair(&socket_a, &socket_b));
« 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