Update to Chromium //base at Chromium commit 3e81715e6d3a4324362635aea46ce1f1a163cca1.

sync_socket_unittest.cc

Index: sync_socket_unittest.cc
diff --git a/sync_socket_unittest.cc b/sync_socket_unittest.cc
index 7c8c97cbc19328bd3a14ffb1b99e861179dc5fae..ff9b8bc8c2f0c7a932d034da2080335e19a7481c 100644
--- a/sync_socket_unittest.cc
+++ b/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));