NQE: Use ResponseHeaders to get the HTTP status code

net/nqe/network_quality_estimator_test_util.cc

 // Copyright 2016 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/nqe/network_quality_estimator_test_util.h"
 
 #include "base/files/file_path.h"
 #include "base/run_loop.h"
 #include "net/base/load_flags.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 
+namespace {
+
+const base::FilePath::CharType kTestFilePath[] =
+    FILE_PATH_LITERAL("net/data/url_request_unittest");
+
+}  // namespace
+
 namespace net {
 
 TestNetworkQualityEstimator::TestNetworkQualityEstimator(
     const std::map<std::string, std::string>& variation_params,
     std::unique_ptr<net::ExternalEstimateProvider> external_estimate_provider)
     : TestNetworkQualityEstimator(std::move(external_estimate_provider),
                                   variation_params,
                                   true,
                                   true) {}
 
 TestNetworkQualityEstimator::TestNetworkQualityEstimator(
     std::unique_ptr<net::ExternalEstimateProvider> external_estimate_provider,
     const std::map<std::string, std::string>& variation_params,
     bool allow_local_host_requests_for_tests,
     bool allow_smaller_responses_for_tests)
     : NetworkQualityEstimator(std::move(external_estimate_provider),
                               variation_params,
                               allow_local_host_requests_for_tests,
                               allow_smaller_responses_for_tests),
       current_network_type_(NetworkChangeNotifier::CONNECTION_UNKNOWN),
       accuracy_recording_intervals_set_(false),
-      rand_double_(0.0) {
+      rand_double_(0.0),
+      embedded_test_server_(base::FilePath(kTestFilePath)) {
   // Set up the embedded test server.
-  embedded_test_server_.ServeFilesFromDirectory(
-      base::FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest")));
-  embedded_test_server_.RegisterRequestHandler(base::Bind(
-      &TestNetworkQualityEstimator::HandleRequest, base::Unretained(this)));
   EXPECT_TRUE(embedded_test_server_.Start());
 }
 
 TestNetworkQualityEstimator::TestNetworkQualityEstimator(
     const std::map<std::string, std::string>& variation_params)
     : TestNetworkQualityEstimator(variation_params,
                                   std::unique_ptr<ExternalEstimateProvider>()) {
 }
 
 TestNetworkQualityEstimator::~TestNetworkQualityEstimator() {}
@@ skipping 11 matching lines @@
 }
 
 void TestNetworkQualityEstimator::SimulateNetworkChange(
     NetworkChangeNotifier::ConnectionType new_connection_type,
     const std::string& network_id) {
   current_network_type_ = new_connection_type;
   current_network_id_ = network_id;
   OnConnectionTypeChanged(new_connection_type);
 }
 
-std::unique_ptr<test_server::HttpResponse>
-TestNetworkQualityEstimator::HandleRequest(
-    const test_server::HttpRequest& request) {
-  std::unique_ptr<test_server::BasicHttpResponse> http_response(
-      new test_server::BasicHttpResponse());
-  http_response->set_code(HTTP_OK);
-  http_response->set_content("hello");
-  http_response->set_content_type("text/plain");
-  return std::move(http_response);
+const GURL TestNetworkQualityEstimator::GetEchoURL() const {
+  return embedded_test_server_.GetURL("/simple.html");
 }
 
-const GURL TestNetworkQualityEstimator::GetEchoURL() const {
-  return embedded_test_server_.GetURL("/echo.html");
+const GURL TestNetworkQualityEstimator::GetRedirectURL() const {
+  return embedded_test_server_.GetURL("/redirect302-to-https");
 }
 
 EffectiveConnectionType
 TestNetworkQualityEstimator::GetEffectiveConnectionType() const {
   if (effective_connection_type_)
     return effective_connection_type_.value();
   return NetworkQualityEstimator::GetEffectiveConnectionType();
 }
 
 EffectiveConnectionType
@@ skipping 92 matching lines @@
 
 double TestNetworkQualityEstimator::RandDouble() const {
   return rand_double_;
 }
 
 nqe::internal::NetworkID TestNetworkQualityEstimator::GetCurrentNetworkID()
     const {
   return nqe::internal::NetworkID(current_network_type_, current_network_id_);
 }
 
+TestNetworkQualityEstimator::LocalHttpTestServer::LocalHttpTestServer(
+    const base::FilePath& document_root) {
+  AddDefaultHandlers(document_root);
+}
+
 }  // namespace net