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

sync_socket_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // 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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const int kReceiveTimeoutInMilliseconds = 750;
 
 class HangingReceiveThread : public base::DelegateSimpleThread::Delegate {
@@ skipping 91 matching lines @@
 
 TEST(CancelableSyncSocket, NormalSendReceivePeek) {
   NormalSendReceivePeek<base::CancelableSyncSocket>();
 }
 
 TEST(CancelableSyncSocket, ClonedSendReceivePeek) {
   ClonedSendReceivePeek<base::CancelableSyncSocket>();
 }
 
 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));
 
   base::TimeTicks start = base::TimeTicks::Now();
   HangingReceiveThread thread(&socket_b);
   ASSERT_TRUE(socket_b.Shutdown());
   thread.Stop();
 
   // Ensure the receive didn't just timeout.
   ASSERT_LT((base::TimeTicks::Now() - start).InMilliseconds(),
             kReceiveTimeoutInMilliseconds);
 
   ASSERT_TRUE(socket_a.Close());
   ASSERT_TRUE(socket_b.Close());
 }