Add a gyp flag to enable dcheck by default in release without

net/socket/transport_client_socket_pool_unittest.cc

 // Copyright (c) 2011 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 "net/socket/transport_client_socket_pool.h"
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 779 matching lines @@
     return callback_.WaitForResult();
   }
 
  private:
   ClientSocketHandle* const handle_;
   TransportClientSocketPool* const pool_;
   bool within_callback_;
   TestCompletionCallback callback_;
 };
 
-TEST_F(TransportClientSocketPoolTest, RequestTwice) {
+// Disabled in release with dcheck : http://crbug.com/94501
+#if defined(DCHECK_ALWAYS_ON)
+#define MAYBE_RequestTwice DISABLED_RequestTwice
+#else
+#define MAYBE_RequestTwice RequestTwice
+#endif
+TEST_F(TransportClientSocketPoolTest, MAYBE_RequestTwice) {
   ClientSocketHandle handle;
   RequestSocketCallback callback(&handle, &pool_);
   scoped_refptr<TransportSocketParams> dest(new TransportSocketParams(
       HostPortPair("www.google.com", 80), LOWEST, GURL(), false, false));
   int rv = handle.Init("a", dest, LOWEST, &callback, &pool_,
                        BoundNetLog());
   ASSERT_EQ(ERR_IO_PENDING, rv);
 
   // The callback is going to request "www.google.com". We want it to complete
   // synchronously this time.
@@ skipping 178 matching lines @@
     EXPECT_EQ(0, pool_.IdleSocketCount());
   }
 }
 
 // Test the case where a socket took long enough to start the creation
 // of the backup socket and never completes, and then the backup
 // connection fails.
 //
 // Flaky on Mac + Linux - http://crbug.com/86550
 // Flaky on ChromeOS - http://crbug.com/89273
+// Disabled in release with dcheck : http://crbug.com/94501
 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_LINUX)
 #define MAYBE_BackupSocketFailAfterStall FLAKY_BackupSocketFailAfterStall
+#elif defined(DCHECK_ALWAYS_ON)
+#define MAYBE_BackupSocketFailAfterStall DISABLED_BackupSocketFailAfterStall
 #else
 #define MAYBE_BackupSocketFailAfterStall BackupSocketFailAfterStall
 #endif
 TEST_F(TransportClientSocketPoolTest, MAYBE_BackupSocketFailAfterStall) {
   MockClientSocketFactory::ClientSocketType case_types[] = {
     // The first socket will not connect.
     MockClientSocketFactory::MOCK_STALLED_CLIENT_SOCKET,
     // The second socket will fail immediately.
     MockClientSocketFactory::MOCK_FAILING_CLIENT_SOCKET
   };
@@ skipping 28 matching lines @@
   EXPECT_EQ(0, pool_.IdleSocketCount());
   handle.Reset();
 
   // Reset for the next case.
   host_resolver_->set_synchronous_mode(false);
 }
 
 // Test the case where a socket took long enough to start the creation
 // of the backup socket and eventually completes, but the backup socket
 // fails.
-TEST_F(TransportClientSocketPoolTest, BackupSocketFailAfterDelay) {
+// Disabled in release with dcheck : http://crbug.com/94501
+#if defined(DCHECK_ALWAYS_ON)
+#define MAYBE_BackupSocketFailAfterDelay DISABLED_BackupSocketFailAfterDelay
+#else
+#define MAYBE_BackupSocketFailAfterDelay BackupSocketFailAfterDelay
+#endif
+TEST_F(TransportClientSocketPoolTest, MAYBE_BackupSocketFailAfterDelay) {
   MockClientSocketFactory::ClientSocketType case_types[] = {
     // The first socket will connect, although delayed.
     MockClientSocketFactory::MOCK_DELAYED_CLIENT_SOCKET,
     // The second socket will not connect.
     MockClientSocketFactory::MOCK_FAILING_CLIENT_SOCKET
   };
 
   client_socket_factory_.set_client_socket_types(case_types, 2);
   client_socket_factory_.set_delay_ms(5000);
 
@@ skipping 175 matching lines @@
   EXPECT_TRUE(handle.socket());
   IPEndPoint endpoint;
   handle.socket()->GetLocalAddress(&endpoint);
   EXPECT_EQ(kIPv4AddressSize, endpoint.address().size());
   EXPECT_EQ(1, client_socket_factory_.allocation_count());
 }
 
 }  // namespace
 
 }  // namespace net