diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/net/test/spawned_test_server | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/net/test/spawned_test_server')
3 files changed, 10 insertions, 7 deletions
diff --git a/chromium/net/test/spawned_test_server/base_test_server.cc b/chromium/net/test/spawned_test_server/base_test_server.cc index 22fd960a7f3..8330ccda5d2 100644 --- a/chromium/net/test/spawned_test_server/base_test_server.cc +++ b/chromium/net/test/spawned_test_server/base_test_server.cc @@ -19,6 +19,7 @@ #include "net/base/address_list.h" #include "net/base/host_port_pair.h" #include "net/base/net_errors.h" +#include "net/base/network_isolation_key.h" #include "net/base/port_util.h" #include "net/base/test_completion_callback.h" #include "net/cert/test_root_certs.h" @@ -221,7 +222,8 @@ bool BaseTestServer::GetAddressList(AddressList* address_list) const { parameters.dns_query_type = DnsQueryType::A; std::unique_ptr<HostResolver::ResolveHostRequest> request = - resolver->CreateRequest(host_port_pair_, NetLogWithSource(), parameters); + resolver->CreateRequest(host_port_pair_, NetworkIsolationKey(), + NetLogWithSource(), parameters); TestCompletionCallback callback; int rv = request->Start(callback.callback()); @@ -361,15 +363,14 @@ void BaseTestServer::SetResourcePath(const base::FilePath& document_root, bool BaseTestServer::SetAndParseServerData(const std::string& server_data, int* port) { VLOG(1) << "Server data: " << server_data; - base::JSONReader json_reader; - base::Optional<base::Value> value(json_reader.ReadToValue(server_data)); - if (!value || !value->is_dict()) { - LOG(ERROR) << "Could not parse server data: " - << json_reader.GetErrorMessage(); + base::JSONReader::ValueWithError parsed_json = + base::JSONReader::ReadAndReturnValueWithError(server_data); + if (!parsed_json.value || !parsed_json.value->is_dict()) { + LOG(ERROR) << "Could not parse server data: " << parsed_json.error_message; return false; } - server_data_ = std::move(value); + server_data_ = std::move(parsed_json.value); base::Optional<int> port_value = server_data_->FindIntKey("port"); if (!port_value) { diff --git a/chromium/net/test/spawned_test_server/local_test_server.cc b/chromium/net/test/spawned_test_server/local_test_server.cc index 3f46015d4fc..eb5016bd805 100644 --- a/chromium/net/test/spawned_test_server/local_test_server.cc +++ b/chromium/net/test/spawned_test_server/local_test_server.cc @@ -7,6 +7,7 @@ #include "base/command_line.h" #include "base/json/json_reader.h" #include "base/logging.h" +#include "base/notreached.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/threading/thread_restrictions.h" diff --git a/chromium/net/test/spawned_test_server/local_test_server_win.cc b/chromium/net/test/spawned_test_server/local_test_server_win.cc index 085a3f8cd59..319eee0789e 100644 --- a/chromium/net/test/spawned_test_server/local_test_server_win.cc +++ b/chromium/net/test/spawned_test_server/local_test_server_win.cc @@ -11,6 +11,7 @@ #include "base/command_line.h" #include "base/environment.h" #include "base/files/file_path.h" +#include "base/logging.h" #include "base/path_service.h" #include "base/process/launch.h" #include "base/strings/string_number_conversions.h" |