| Index: net/spdy/spdy_network_transaction_unittest.cc
|
| diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
|
| index d701ddb6507c275c688bff26b52e207f4dc87a9d..93cbd92b30652aeb0f821ad2e163fad0ed4951f8 100644
|
| --- a/net/spdy/spdy_network_transaction_unittest.cc
|
| +++ b/net/spdy/spdy_network_transaction_unittest.cc
|
| @@ -11,6 +11,7 @@
|
| #include "base/files/file_util.h"
|
| #include "base/files/scoped_temp_dir.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "base/memory/weak_ptr.h"
|
| #include "base/run_loop.h"
|
| #include "base/strings/string_piece.h"
|
| #include "base/test/test_file_util.h"
|
| @@ -20,6 +21,7 @@
|
| #include "net/base/elements_upload_data_stream.h"
|
| #include "net/base/request_priority.h"
|
| #include "net/base/test_data_directory.h"
|
| +#include "net/base/default_trusted_spdy_proxy_provider.h"
|
| #include "net/base/upload_bytes_element_reader.h"
|
| #include "net/base/upload_file_element_reader.h"
|
| #include "net/http/http_auth_scheme.h"
|
| @@ -30,6 +32,7 @@
|
| #include "net/log/test_net_log.h"
|
| #include "net/log/test_net_log_entry.h"
|
| #include "net/log/test_net_log_util.h"
|
| +#include "net/proxy/proxy_server.h"
|
| #include "net/socket/client_socket_pool_base.h"
|
| #include "net/socket/next_proto.h"
|
| #include "net/spdy/buffered_spdy_framer.h"
|
| @@ -5476,7 +5479,11 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushCrossOriginCorrectness) {
|
| // not actually enable cross-origin SPDY push.
|
| scoped_ptr<SpdySessionDependencies> session_deps(
|
| CreateSpdySessionDependencies(GetParam()));
|
| - session_deps->trusted_spdy_proxy = "123.45.67.89:8080";
|
| + DefaultTrustedSpdyProxyProvider trusted_spdy_proxy_provider(
|
| + net::ProxyServer::FromURI("https://123.45.67.89:443",
|
| + net::ProxyServer::SCHEME_HTTP));
|
| + session_deps->trusted_spdy_proxy_provider =
|
| + trusted_spdy_proxy_provider.GetWeakPtr();
|
| NormalSpdyTransactionHelper helper(request, DEFAULT_PRIORITY, BoundNetLog(),
|
| GetParam(), std::move(session_deps));
|
| helper.RunPreTestSetup();
|
|
|