Plumb NQP to context and to http_proxy_client_socket_pool

net/http/http_proxy_client_socket_pool_unittest.cc

 // Copyright (c) 2012 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/http/http_proxy_client_socket_pool.h"
 
 #include <utility>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/histogram_tester.h"
 #include "net/base/net_errors.h"
 #include "net/base/proxy_delegate.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/test_proxy_delegate.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_proxy_client_socket.h"
 #include "net/http/http_response_headers.h"
 #include "net/log/net_log_with_source.h"
+#include "net/nqe/network_quality_estimator_test_util.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/next_proto.h"
 #include "net/socket/socket_test_util.h"
 #include "net/spdy/chromium/spdy_test_util_common.h"
 #include "net/spdy/core/spdy_protocol.h"
 #include "net/test/gtest_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using net::test::IsError;
@@ skipping 39 matching lines @@
                          session_deps_.socket_factory.get(),
                          &transport_socket_pool_,
                          NULL,
                          NULL,
                          session_deps_.ssl_config_service.get(),
                          NetLogWithSource().net_log()),
         pool_(kMaxSockets,
               kMaxSocketsPerGroup,
               &transport_socket_pool_,
               &ssl_socket_pool_,
+              &estimator_,
               NULL) {
     session_ = CreateNetworkSession();
   }
 
   virtual ~HttpProxyClientSocketPoolTest() {}
 
   void AddAuthToCache() {
     const base::string16 kFoo(base::ASCIIToUTF16("foo"));
     const base::string16 kBar(base::ASCIIToUTF16("bar"));
     GURL proxy_url(GetParam() == HTTP
@@ skipping 99 matching lines @@
 
   RequestPriority GetLastTransportRequestPriority() const {
     return transport_socket_pool_.last_request_priority();
   }
 
   const base::HistogramTester& histogram_tester() { return histogram_tester_; }
 
  private:
   SpdySessionDependencies session_deps_;
 
+  TestNetworkQualityEstimator estimator_;
+
   MockTransportClientSocketPool transport_socket_pool_;
   MockHostResolver host_resolver_;
   std::unique_ptr<CertVerifier> cert_verifier_;
   SSLClientSocketPool ssl_socket_pool_;
 
   std::unique_ptr<HttpNetworkSession> session_;
 
   base::HistogramTester histogram_tester_;
 
  protected:
@@ skipping 505 matching lines @@
     // Make sure Content-Length: 0 header was added.
     EXPECT_TRUE(headers->HasHeaderValue("content-length", "0"));
 
     // Make sure Location header was included and correct.
     std::string location;
     EXPECT_TRUE(headers->IsRedirect(&location));
     EXPECT_EQ(location, redirectTarget);
   }
 }
 
+TEST_P(HttpProxyClientSocketPoolTest, ProxyPoolTimeout) {

[mmenke, 2017/06/07 21:31:26]

Hrm...Do we get anything from this?  We admittedly don't do a great job of
testing timeouts, just not sure this gets us anything, though we should
certainly test both new methods once they do stuff.

[mmenke, 2017/06/07 21:31:26]

Not sure this really gets us anything.  We should certainly test both methods
once they actually do stuff, just not sure this test currently is useful.

[tbansal1, 2017/06/08 05:01:50]

Acknowledged.

[tbansal1, 2017/06/08 05:01:50]

Well, admittedly the test is very basic, but it checks that the CL is not
changing status quo. I was planning to expand the tests once the new methods do
more meaningful stuff. I can remove this test until then if you feel like so.

[mmenke, 2017/06/08 17:53:02]

Still skeptical, but OK.

+  ASSERT_LE(base::TimeDelta(), pool_.ConnectionTimeout());
+
+  // Test against a large value.
+  ASSERT_GE(base::TimeDelta::FromMinutes(10), pool_.ConnectionTimeout());
+
+#if (defined(OS_ANDROID) || defined(OS_IOS))
+  // On Android and iOS, the timeout is fixed to 10 seconds.
+  ASSERT_EQ(base::TimeDelta::FromSeconds(10), pool_.ConnectionTimeout());
+#endif
+}
+
 // It would be nice to also test the timeouts in HttpProxyClientSocketPool.
 
 }  // namespace net