Merge remote-tracking branch 'origin/mirror-aosp-master' into merge
diff --git a/buffet/webserv_client.cc b/buffet/webserv_client.cc
index 3fe5d0c..a66ed3f 100644
--- a/buffet/webserv_client.cc
+++ b/buffet/webserv_client.cc
@@ -135,6 +135,12 @@
return https_port_;
}
+base::TimeDelta WebServClient::GetRequestTimeout() const {
+ // TODO(avakulenko): obtain the timeout from web server.
+ // The current timeout is set to 1 minute.
+ return base::TimeDelta::FromSeconds(60);
+}
+
brillo::Blob WebServClient::GetHttpsCertificateFingerprint() const {
return certificate_;
}
diff --git a/buffet/webserv_client.h b/buffet/webserv_client.h
index 8b0ab7c..1c0d44c 100644
--- a/buffet/webserv_client.h
+++ b/buffet/webserv_client.h
@@ -57,6 +57,7 @@
uint16_t GetHttpPort() const override;
uint16_t GetHttpsPort() const override;
+ base::TimeDelta GetRequestTimeout() const override;
std::vector<uint8_t> GetHttpsCertificateFingerprint() const override;
private:
@@ -64,11 +65,6 @@
std::unique_ptr<libwebserv::Request> request,
std::unique_ptr<libwebserv::Response> response);
- void OnResponse(std::unique_ptr<libwebserv::Response> response,
- int status_code,
- const std::string& data,
- const std::string& mime_type);
-
void OnProtocolHandlerConnected(
libwebserv::ProtocolHandler* protocol_handler);