Clean up CrxDownloader::Result and CrxDownloader::ProgressCallback
This is a follow up of CL https://crrev.com/c/1136518 where,
CrDownloader/UrlFetcherDownloader migrated from URLFetcher to
SimpleURLLoader.
As part of the migration, it was verified that CrxDownloader::Result
had struct members only used in unit tests: |downloaded_bytes| and
|total_bytes|.
Additionally, the CrxDownloader::ProgressCallback did not use its
|result| parameter.
This CL removes the struct members from CrxDownloader::Result as well
as their use (mocked up anyways) in unittests, and removes the unused
|result| parameter from CrxDownloader::ProgressCallback.
BUG=844972, 871211
Change-Id: I5b36c63784ff2632f71c1e5a0cd44b6e0c7c7f37
Reviewed-on: https://chromium-review.googlesource.com/1190324
Commit-Queue: Antonio Gomes <[email protected]>
Reviewed-by: Joshua Pawlicki <[email protected]>
Cr-Commit-Position: refs/heads/master@{#586361}diff --git a/components/update_client/update_client_unittest.cc b/components/update_client/update_client_unittest.cc
index 90ddb4d..dc41bbd 100644
--- a/components/update_client/update_client_unittest.cc
+++ b/components/update_client/update_client_unittest.cc
@@ -466,12 +466,10 @@
Result result;
result.error = 0;
result.response = path;
- result.downloaded_bytes = 1843;
- result.total_bytes = 1843;
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadProgress,
- base::Unretained(this), result));
+ base::Unretained(this)));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadComplete,
@@ -668,12 +666,10 @@
Result result;
result.error = 0;
result.response = path;
- result.downloaded_bytes = 1843;
- result.total_bytes = 1843;
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadProgress,
- base::Unretained(this), result));
+ base::Unretained(this)));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadComplete,
@@ -878,15 +874,13 @@
result.error = 0;
result.response = path;
- result.downloaded_bytes = 1843;
- result.total_bytes = 1843;
} else {
NOTREACHED();
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadProgress,
- base::Unretained(this), result));
+ base::Unretained(this)));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadComplete,
@@ -1204,8 +1198,6 @@
// The result must not include a file path in the case of errors.
result.error = -118;
- result.downloaded_bytes = 0;
- result.total_bytes = 0;
} else if (url.path() ==
"/download/ihfokbkgjpifnbbojhneepfflplebdkc_1.crx") {
download_metrics.url = url;
@@ -1220,15 +1212,13 @@
result.error = 0;
result.response = path;
- result.downloaded_bytes = 53638;
- result.total_bytes = 53638;
} else {
NOTREACHED();
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadProgress,
- base::Unretained(this), result));
+ base::Unretained(this)));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadComplete,
@@ -1501,8 +1491,6 @@
result.error = 0;
result.response = path;
- result.downloaded_bytes = 53638;
- result.total_bytes = 53638;
} else if (url.path() ==
"/download/ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx") {
download_metrics.url = url;
@@ -1517,15 +1505,13 @@
result.error = 0;
result.response = path;
- result.downloaded_bytes = 2105;
- result.total_bytes = 2105;
} else {
NOTREACHED();
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadProgress,
- base::Unretained(this), result));
+ base::Unretained(this)));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadComplete,
@@ -1777,12 +1763,10 @@
Result result;
result.error = 0;
result.response = path;
- result.downloaded_bytes = 1843;
- result.total_bytes = 1843;
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadProgress,
- base::Unretained(this), result));
+ base::Unretained(this)));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadComplete,
@@ -2028,8 +2012,6 @@
result.error = 0;
result.response = path;
- result.downloaded_bytes = 53638;
- result.total_bytes = 53638;
} else if (url.path() ==
"/download/ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx") {
// A download error is injected on this execution path.
@@ -2042,8 +2024,6 @@
// The response must not include a file path in the case of errors.
result.error = -1;
- result.downloaded_bytes = 0;
- result.total_bytes = 2105;
} else if (url.path() ==
"/download/ihfokbkgjpifnbbojhneepfflplebdkc_2.crx") {
download_metrics.url = url;
@@ -2058,13 +2038,11 @@
result.error = 0;
result.response = path;
- result.downloaded_bytes = 53855;
- result.total_bytes = 53855;
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadProgress,
- base::Unretained(this), result));
+ base::Unretained(this)));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadComplete,
@@ -2398,15 +2376,13 @@
result.error = 0;
result.response = path;
- result.downloaded_bytes = 1843;
- result.total_bytes = 1843;
} else {
NOTREACHED();
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadProgress,
- base::Unretained(this), result));
+ base::Unretained(this)));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadComplete,
@@ -3185,15 +3161,13 @@
result.error = 0;
result.response = path;
- result.downloaded_bytes = 53638;
- result.total_bytes = 53638;
} else {
NOTREACHED();
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadProgress,
- base::Unretained(this), result));
+ base::Unretained(this)));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(&MockCrxDownloader::OnDownloadComplete,
@@ -3693,8 +3667,6 @@
result.error = 0;
result.response = path;
- result.downloaded_bytes = 1843;
- result.total_bytes = 1843;
} else {
NOTREACHED();
}
