Change error message for WebSocket tunnel failure.

net/websockets/websocket_test_util.h

 // 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.
 
 #ifndef NET_WEBSOCKETS_WEBSOCKET_TEST_UTIL_H_
 #define NET_WEBSOCKETS_WEBSOCKET_TEST_UTIL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/url_request/url_request_test_util.h"
 #include "net/websockets/websocket_stream.h"
 
 class GURL;
 
 namespace base {
 class Timer;
 }  // namespace base
 
 namespace url {
 class Origin;
 }  // namespace url
 
 namespace net {
 
 class BoundNetLog;
 class DeterministicMockClientSocketFactory;
 class DeterministicSocketData;

[yhirano, 2015/02/06 04:27:01]

+ class ProxyService;

[Adam Rice, 2015/02/06 08:06:14]

Done.

 class URLRequestContext;
 class WebSocketHandshakeStreamCreateHelper;
 struct SSLSocketDataProvider;
 
 class LinearCongruentialGenerator {
  public:
   explicit LinearCongruentialGenerator(uint32 seed);
   uint32 Generate();
 
  private:
@@ skipping 76 matching lines @@
                        const std::string& return_to_read) {
     maker_.SetExpectations(expect_written, return_to_read);
   }
 
   void AddRawExpectations(scoped_ptr<DeterministicSocketData> socket_data);
 
   // Allow an SSL socket data provider to be added.
   void AddSSLSocketDataProvider(
       scoped_ptr<SSLSocketDataProvider> ssl_socket_data);
 
+  // Allow a proxy to be set. Usage:
+  //   SetProxyService(make_scoped_ptr(ProxyService::CreateFixed("pro1:8000")))
+  // Must be called prior to GetURLRequestContext().
+  void SetProxyService(scoped_ptr<ProxyService> proxy_service);
+
   // Call after calling one of SetExpections() or AddRawExpectations(). The
   // returned pointer remains owned by this object.
   TestURLRequestContext* GetURLRequestContext();
 
  private:
   WebSocketDeterministicMockClientSocketFactoryMaker maker_;
   TestURLRequestContext url_request_context_;
   TestNetworkDelegate network_delegate_;
   bool url_request_context_initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(WebSocketTestURLRequestContextHost);
 };
 
 }  // namespace net
 
 #endif  // NET_WEBSOCKETS_WEBSOCKET_TEST_UTIL_H_