commit 6184e5d80e6152cd98675185870f7842951b4d56
author Alex Vakulenko <avakulenko@google.com> Wed Nov 18 21:30:45 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 18 21:30:45 2015 +0000
tree 25c627ac22f508370ff85d4c39ea7452abbaa8a3
parent c9c2e7a76194b3943605242cbe0f0b6cad4b2422
parent b55800bb6ce26de6dcbdbf25bd5a7e8d07a3fa03

weaved: Use real webserver\'s request timeout value
am: b55800bb6c

* commit 'b55800bb6ce26de6dcbdbf25bd5a7e8d07a3fa03':
  weaved: Use real webserver's request timeout value

buffet/webserv_client.cc

diff --git a/buffet/webserv_client.cc b/buffet/webserv_client.cc
index a66ed3f..154bc5f 100644
--- a/buffet/webserv_client.cc
+++ b/buffet/webserv_client.cc
@@ -136,9 +136,7 @@
 }
 
 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);
+  return web_server_->GetDefaultRequestTimeout();
 }
 
 brillo::Blob WebServClient::GetHttpsCertificateFingerprint() const {