Introduce an 'ENABLE_WEBSOCKETS' define in //net.

net/url_request/url_request_http_job_unittest.cc

 // Copyright (c) 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 "net/url_request/url_request_http_job.h"
 
 #include <stdint.h>
 
 #include <cstddef>
 #include <memory>
@@ skipping 630 matching lines @@
 
   struct TestCase {
     const char* url;
     bool upgrade_expected;
     const char* url_expected;
   } cases[] = {
     {"http://upgrade.test/", true, "https://upgrade.test/"},
     {"http://upgrade.test:123/", true, "https://upgrade.test:123/"},
     {"http://no-upgrade.test/", false, "http://no-upgrade.test/"},
     {"http://no-upgrade.test:123/", false, "http://no-upgrade.test:123/"},
-// iOS doesn't support websockets; see the comments above
-// URLRequestHttpJobWebSocketTest for detail.
-#if !defined(OS_IOS)
+#if defined(ENABLE_WEBSOCKETS)

[mmenke, 2016/06/20 15:14:09]

url_request_job_manager.cc also has an defined(OS_IOS) check that should be
updated.

[Mike West, 2016/06/21 10:31:15]

Done.

     {"ws://upgrade.test/", true, "wss://upgrade.test/"},
     {"ws://upgrade.test:123/", true, "wss://upgrade.test:123/"},
     {"ws://no-upgrade.test/", false, "ws://no-upgrade.test/"},
     {"ws://no-upgrade.test:123/", false, "ws://no-upgrade.test:123/"},
-#endif  // !defined(OS_IOS)
+#endif  // defined(ENABLE_WEBSOCKETS)
   };
 
   for (const auto& test : cases) {
     SCOPED_TRACE(test.url);
     TestDelegate d;
     TestNetworkDelegate network_delegate;
     std::unique_ptr<URLRequest> r(
         context_.CreateRequest(GURL(test.url), DEFAULT_PRIORITY, &d));
 
     net_log_.Clear();
@@ skipping 220 matching lines @@
   }
 
   MOCK_METHOD0(CreateBasicStreamMock,
                WebSocketHandshakeStreamBase*());
 
   MOCK_METHOD2(CreateSpdyStream,
                WebSocketHandshakeStreamBase*(const base::WeakPtr<SpdySession>&,
                                              bool));
 };
 
-// iOS doesn't support WebSockets, so these tests fail with ERR_UNKOWN_SCHEME on
-// iOS.
-// TODO(mmenke):  Hard coding features based on OS is regression prone and ugly.
-// Seems like this should use a build flag instead.
-#if !defined(OS_IOS)
+#if defined(ENABLE_WEBSOCKETS)
 
 class FakeWebSocketHandshakeStream : public WebSocketHandshakeStreamBase {
  public:
   FakeWebSocketHandshakeStream() : initialize_stream_was_called_(false) {}
 
   bool initialize_stream_was_called() const {
     return initialize_stream_was_called_;
   }
 
   // Fake implementation of HttpStreamBase methods.
@@ skipping 88 matching lines @@
       .WillOnce(Return(fake_handshake_stream));
   req_->SetUserData(WebSocketHandshakeStreamBase::CreateHelper::DataKey(),
                     create_helper.release());
   req_->SetLoadFlags(LOAD_DISABLE_CACHE);
   req_->Start();
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(URLRequestStatus::IO_PENDING, req_->status().status());
   EXPECT_TRUE(fake_handshake_stream->initialize_stream_was_called());
 }
 
-#endif  // !defined(OS_IOS)
+#endif  // defined(ENABLE_WEBSOCKETS)
 
 }  // namespace
 
 }  // namespace net