summaryrefslogtreecommitdiff
path: root/chromium/net/cert_net
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-16 09:59:13 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-20 10:28:53 +0000
commit6c11fb357ec39bf087b8b632e2b1e375aef1b38b (patch)
treec8315530db18a8ee566521c39ab8a6af4f72bc03 /chromium/net/cert_net
parent3ffaed019d0772e59d6cdb2d0d32fe4834c31f72 (diff)
downloadqtwebengine-chromium-6c11fb357ec39bf087b8b632e2b1e375aef1b38b.tar.gz
BASELINE: Update Chromium to 74.0.3729.159
Change-Id: I8d2497da544c275415aedd94dd25328d555de811 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/cert_net')
-rw-r--r--chromium/net/cert_net/cert_net_fetcher_impl.cc7
-rw-r--r--chromium/net/cert_net/cert_net_fetcher_impl_unittest.cc26
-rw-r--r--chromium/net/cert_net/nss_ocsp.cc4
3 files changed, 21 insertions, 16 deletions
diff --git a/chromium/net/cert_net/cert_net_fetcher_impl.cc b/chromium/net/cert_net/cert_net_fetcher_impl.cc
index 32fb966df5e..e2f2083e7cb 100644
--- a/chromium/net/cert_net/cert_net_fetcher_impl.cc
+++ b/chromium/net/cert_net/cert_net_fetcher_impl.cc
@@ -61,6 +61,7 @@
#include <tuple>
#include <utility>
+#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/logging.h"
#include "base/macros.h"
@@ -386,7 +387,7 @@ class Job : public URLRequest::Delegate {
void RequestCore::CancelJob() {
if (!task_runner_->RunsTasksInCurrentSequence()) {
task_runner_->PostTask(FROM_HERE,
- base::Bind(&RequestCore::CancelJob, this));
+ base::BindOnce(&RequestCore::CancelJob, this));
return;
}
@@ -798,8 +799,8 @@ class CertNetFetcherImpl : public CertNetFetcher {
// then the request will hang (that is, WaitForResult will not return).
if (!task_runner_->PostTask(
FROM_HERE,
- base::Bind(&CertNetFetcherImpl::DoFetchOnNetworkSequence, this,
- base::Passed(&request_params), request_core))) {
+ base::BindOnce(&CertNetFetcherImpl::DoFetchOnNetworkSequence, this,
+ std::move(request_params), request_core))) {
request_core->SignalImmediateError();
}
diff --git a/chromium/net/cert_net/cert_net_fetcher_impl_unittest.cc b/chromium/net/cert_net/cert_net_fetcher_impl_unittest.cc
index 2e3b75a3548..87bfddfcffd 100644
--- a/chromium/net/cert_net/cert_net_fetcher_impl_unittest.cc
+++ b/chromium/net/cert_net/cert_net_fetcher_impl_unittest.cc
@@ -8,6 +8,7 @@
#include <string>
#include <utility>
+#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
@@ -123,8 +124,9 @@ class CertNetFetcherImplTest : public PlatformTest {
if (!network_thread_)
return;
network_thread_->task_runner()->PostTask(
- FROM_HERE, base::Bind(&CertNetFetcherImplTest::TeardownOnNetworkThread,
- base::Unretained(this)));
+ FROM_HERE,
+ base::BindOnce(&CertNetFetcherImplTest::TeardownOnNetworkThread,
+ base::Unretained(this)));
network_thread_->Stop();
}
@@ -141,8 +143,8 @@ class CertNetFetcherImplTest : public PlatformTest {
base::WaitableEvent::InitialState::NOT_SIGNALED);
network_thread_->task_runner()->PostTask(
FROM_HERE,
- base::Bind(&CertNetFetcherImplTest::CreateFetcherOnNetworkThread,
- base::Unretained(this), &done));
+ base::BindOnce(&CertNetFetcherImplTest::CreateFetcherOnNetworkThread,
+ base::Unretained(this), &done));
done.Wait();
}
@@ -156,8 +158,8 @@ class CertNetFetcherImplTest : public PlatformTest {
base::WaitableEvent::InitialState::NOT_SIGNALED);
network_thread_->task_runner()->PostTask(
FROM_HERE,
- base::Bind(&CertNetFetcherImplTest::ShutDownFetcherOnNetworkThread,
- base::Unretained(this), &done));
+ base::BindOnce(&CertNetFetcherImplTest::ShutDownFetcherOnNetworkThread,
+ base::Unretained(this), &done));
done.Wait();
}
@@ -166,8 +168,8 @@ class CertNetFetcherImplTest : public PlatformTest {
base::WaitableEvent done(base::WaitableEvent::ResetPolicy::MANUAL,
base::WaitableEvent::InitialState::NOT_SIGNALED);
network_thread_->task_runner()->PostTask(
- FROM_HERE, base::Bind(&CertNetFetcherImplTest::CountCreatedRequests,
- base::Unretained(this), &count, &done));
+ FROM_HERE, base::BindOnce(&CertNetFetcherImplTest::CountCreatedRequests,
+ base::Unretained(this), &count, &done));
done.Wait();
return count;
}
@@ -182,8 +184,8 @@ class CertNetFetcherImplTest : public PlatformTest {
base::WaitableEvent done(base::WaitableEvent::ResetPolicy::MANUAL,
base::WaitableEvent::InitialState::NOT_SIGNALED);
network_thread_->task_runner()->PostTask(
- FROM_HERE, base::Bind(&CertNetFetcherImplTest::InitOnNetworkThread,
- base::Unretained(this), &done));
+ FROM_HERE, base::BindOnce(&CertNetFetcherImplTest::InitOnNetworkThread,
+ base::Unretained(this), &done));
done.Wait();
}
@@ -203,8 +205,8 @@ class CertNetFetcherImplTest : public PlatformTest {
base::WaitableEvent::InitialState::NOT_SIGNALED);
network_thread_->task_runner()->PostTask(
FROM_HERE,
- base::Bind(&CertNetFetcherImplTest::ResetStateOnNetworkThread,
- base::Unretained(this), &done));
+ base::BindOnce(&CertNetFetcherImplTest::ResetStateOnNetworkThread,
+ base::Unretained(this), &done));
done.Wait();
}
diff --git a/chromium/net/cert_net/nss_ocsp.cc b/chromium/net/cert_net/nss_ocsp.cc
index cc3ef8b090d..9fa92efecc2 100644
--- a/chromium/net/cert_net/nss_ocsp.cc
+++ b/chromium/net/cert_net/nss_ocsp.cc
@@ -17,6 +17,7 @@
#include <string>
#include <utility>
+#include "base/bind.h"
#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/lazy_instance.h"
@@ -352,7 +353,8 @@ class OCSPRequestSession
lock_.AssertAcquired();
if (io_task_runner_) {
io_task_runner_->PostTask(
- FROM_HERE, base::Bind(&OCSPRequestSession::CancelURLRequest, this));
+ FROM_HERE,
+ base::BindOnce(&OCSPRequestSession::CancelURLRequest, this));
}
}