Commit 902de4de authored by Joshua Pawlicki's avatar Joshua Pawlicki Committed by Commit Bot

Simplify some of the callbacks in the update_client network interface.

Bug: 1020650
Change-Id: I4baa0a0612afb24689854f7109a65b7772a64b88
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1895165
Commit-Queue: Joshua Pawlicki <waffles@chromium.org>
Reviewed-by: default avatarSorin Jianu <sorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712743}
parent 88b572e5
......@@ -69,8 +69,7 @@ void NetworkFetcher::PostRequestComplete() {
void NetworkFetcher::DownloadToFileComplete() {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
std::move(download_to_file_complete_callback_)
.Run(network_fetcher_->GetFilePath(), network_fetcher_->GetNetError(),
network_fetcher_->GetContentSize());
.Run(network_fetcher_->GetNetError(), network_fetcher_->GetContentSize());
}
NetworkFetcherFactory::NetworkFetcherFactory()
......
......@@ -289,9 +289,7 @@ void NetworkFetcherWinHTTP::ReceiveResponseComplete() {
xheader_retry_after_sec_ = xheader_retry_after_sec;
}
std::move(fetch_started_callback_)
.Run(final_url_.is_valid() ? final_url_ : url_, response_code,
content_length);
std::move(fetch_started_callback_).Run(response_code, content_length);
net_error_ = QueryDataAvailable();
if (FAILED(net_error_))
......@@ -525,9 +523,6 @@ void NetworkFetcherWinHTTP::StatusCallback(HINTERNET handle,
<< " handle=" << handle << ", " << msg;
switch (status) {
case WINHTTP_CALLBACK_STATUS_REDIRECT:
final_url_ = GURL(static_cast<base::char16*>(info));
break;
case WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING:
self_ = nullptr;
break;
......
......@@ -122,7 +122,6 @@ class NetworkFetcherWinHTTP
int port_ = 0;
std::string path_for_request_;
GURL final_url_;
base::StringPiece16 verb_;
base::StringPiece16 content_type_;
WriteDataCallback write_data_callback_;
......
......@@ -170,7 +170,7 @@ void NetworkFetcherImpl::DownloadToFile(
DownloadToFileCompleteCallback download_to_file_complete_callback,
base::FilePath file_path) {
std::move(download_to_file_complete_callback)
.Run(file_path, simple_url_loader->NetError(),
.Run(simple_url_loader->NetError(),
simple_url_loader->GetContentSize());
},
simple_url_loader_.get(),
......@@ -183,8 +183,7 @@ void NetworkFetcherImpl::OnResponseStartedCallback(
const GURL& final_url,
const network::mojom::URLResponseHead& response_head) {
std::move(response_started_callback)
.Run(final_url,
response_head.headers ? response_head.headers->response_code() : -1,
.Run(response_head.headers ? response_head.headers->response_code() : -1,
response_head.content_length);
}
......
......@@ -25,15 +25,17 @@ namespace update_client {
class NetworkFetcher {
public:
// If the request does not have an X-Retry-After header, implementations
// should pass -1 for |xheader_retry_after_sec|.
using PostRequestCompleteCallback =
base::OnceCallback<void(std::unique_ptr<std::string> response_body,
int net_error,
const std::string& header_etag,
int64_t xheader_retry_after_sec)>;
using DownloadToFileCompleteCallback = base::OnceCallback<
void(base::FilePath path, int net_error, int64_t content_size)>;
using ResponseStartedCallback = base::OnceCallback<
void(const GURL& final_url, int response_code, int64_t content_length)>;
using DownloadToFileCompleteCallback =
base::OnceCallback<void(int net_error, int64_t content_size)>;
using ResponseStartedCallback =
base::OnceCallback<void(int response_code, int64_t content_length)>;
using ProgressCallback = base::RepeatingCallback<void(int64_t current)>;
// The ETag header carries the ECSDA signature of the POST response, if
......
......@@ -139,8 +139,7 @@ void RequestSender::SendInternalComplete(int error,
HandleSendError(error, retry_after_sec);
}
void RequestSender::OnResponseStarted(const GURL& final_url,
int response_code,
void RequestSender::OnResponseStarted(int response_code,
int64_t content_length) {
response_code_ = response_code;
}
......
......@@ -65,9 +65,7 @@ class RequestSender {
// Decodes and returns the public key used by CUP.
static std::string GetKey(const char* key_bytes_base64);
void OnResponseStarted(const GURL& final_url,
int response_code,
int64_t content_length);
void OnResponseStarted(int response_code, int64_t content_length);
void OnNetworkFetcherComplete(const GURL& original_url,
std::unique_ptr<std::string> response_body,
......
......@@ -84,7 +84,7 @@ void UrlFetcherDownloader::StartURLFetch(const GURL& url) {
base::BindRepeating(&UrlFetcherDownloader::OnDownloadProgress,
base::Unretained(this)),
base::BindOnce(&UrlFetcherDownloader::OnNetworkFetcherComplete,
base::Unretained(this)));
base::Unretained(this), file_path));
download_start_time_ = base::TimeTicks::Now();
}
......@@ -131,7 +131,7 @@ void UrlFetcherDownloader::OnNetworkFetcherComplete(base::FilePath file_path,
download_metrics.download_time_ms = download_time.InMilliseconds();
VLOG(1) << "Downloaded " << content_size << " bytes in "
<< download_time.InMilliseconds() << "ms from " << final_url_.spec()
<< download_time.InMilliseconds() << "ms from " << url().spec()
<< " to " << result.response.value();
// Delete the download directory in the error cases.
......@@ -148,14 +148,12 @@ void UrlFetcherDownloader::OnNetworkFetcherComplete(base::FilePath file_path,
}
// This callback is used to indicate that a download has been started.
void UrlFetcherDownloader::OnResponseStarted(const GURL& final_url,
int response_code,
void UrlFetcherDownloader::OnResponseStarted(int response_code,
int64_t content_length) {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
VLOG(1) << "url fetcher response started for: " << final_url.spec();
VLOG(1) << "url fetcher response started for: " << url().spec();
final_url_ = final_url;
response_code_ = response_code;
total_bytes_ = content_length;
}
......
......@@ -38,9 +38,7 @@ class UrlFetcherDownloader : public CrxDownloader {
void OnNetworkFetcherComplete(base::FilePath file_path,
int net_error,
int64_t content_size);
void OnResponseStarted(const GURL& final_url,
int response_code,
int64_t content_length);
void OnResponseStarted(int response_code, int64_t content_length);
void OnDownloadProgress(int64_t content_length);
THREAD_CHECKER(thread_checker_);
......@@ -53,7 +51,6 @@ class UrlFetcherDownloader : public CrxDownloader {
base::TimeTicks download_start_time_;
GURL final_url_;
int response_code_ = -1;
int64_t total_bytes_ = -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment