Chromium Code Reviews| Index: chrome/browser/android/webapk/webapk_icon_hasher.cc |
| diff --git a/chrome/browser/android/webapk/webapk_icon_hasher.cc b/chrome/browser/android/webapk/webapk_icon_hasher.cc |
| index 51a44322d5aa32bc25c50ad83de301f598dfe48b..afc12dcc353cb1ed04287293214a6c04f6422acd 100644 |
| --- a/chrome/browser/android/webapk/webapk_icon_hasher.cc |
| +++ b/chrome/browser/android/webapk/webapk_icon_hasher.cc |
| @@ -39,6 +39,17 @@ void WebApkIconHasher::DownloadAndComputeMurmur2Hash( |
| net::URLRequestContextGetter* request_context_getter, |
| const GURL& icon_url, |
| const Murmur2HashCallback& callback) { |
| + DownloadAndComputeMurmur2HashWithTimeout(request_context_getter, icon_url, |
| + kDownloadTimeoutInMilliseconds, |
| + callback); |
| +} |
| + |
| +// static |
| +void WebApkIconHasher::DownloadAndComputeMurmur2HashWithTimeout( |
|
dominickn
2017/04/19 00:04:07
Nit: I would call this DownloadAndComputeMurmur2Ha
pkotwicz
2017/04/19 20:34:52
I don't thinkat that DownloadAndComputeMurmur2Hash
|
| + net::URLRequestContextGetter* request_context_getter, |
| + const GURL& icon_url, |
| + int timeout_ms, |
| + const Murmur2HashCallback& callback) { |
| if (!icon_url.is_valid()) { |
| base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, |
| base::Bind(callback, "")); |
| @@ -58,17 +69,17 @@ void WebApkIconHasher::DownloadAndComputeMurmur2Hash( |
| } |
| // The icon hasher will delete itself when it is done. |
| - new WebApkIconHasher(request_context_getter, icon_url, callback); |
| + new WebApkIconHasher(request_context_getter, icon_url, timeout_ms, callback); |
| } |
| WebApkIconHasher::WebApkIconHasher( |
| net::URLRequestContextGetter* url_request_context_getter, |
| const GURL& icon_url, |
| + int timeout_ms, |
| const Murmur2HashCallback& callback) |
| : callback_(callback) { |
| download_timeout_timer_.Start( |
| - FROM_HERE, |
| - base::TimeDelta::FromMilliseconds(kDownloadTimeoutInMilliseconds), |
| + FROM_HERE, base::TimeDelta::FromMilliseconds(timeout_ms), |
| base::Bind(&WebApkIconHasher::OnDownloadTimedOut, |
| base::Unretained(this))); |