Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(764)

Unified Diff: net/url_request/url_request_unittest.cc

Issue 669813003: Update from chromium https://crrev.com/301725/ (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/url_request/url_request_throttler_unittest.cc ('k') | net/websockets/websocket_basic_stream_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_unittest.cc
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 700b07064557a9e1b601a964f0827c708859c26d..d900069d7fc0a9896894c5767e51d5f080fb49f6 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -615,7 +615,7 @@ class URLRequestTest : public PlatformTest {
default_context_.set_job_factory(&job_factory_);
default_context_.Init();
}
- virtual ~URLRequestTest() {
+ ~URLRequestTest() override {
// URLRequestJobs may post clean-up tasks on destruction.
base::RunLoop().RunUntilIdle();
}
@@ -6452,7 +6452,7 @@ class HTTPSRequestTest : public testing::Test {
default_context_.set_network_delegate(&default_network_delegate_);
default_context_.Init();
}
- virtual ~HTTPSRequestTest() {}
+ ~HTTPSRequestTest() override {}
protected:
TestNetworkDelegate default_network_delegate_; // Must outlive URLRequest.
@@ -7125,7 +7125,7 @@ class FallbackTestURLRequestContext : public TestURLRequestContext {
class HTTPSFallbackTest : public testing::Test {
public:
HTTPSFallbackTest() : context_(true) {}
- virtual ~HTTPSFallbackTest() {}
+ ~HTTPSFallbackTest() override {}
protected:
void DoFallbackTest(const SpawnedTestServer::SSLOptions& ssl_options) {
@@ -7377,7 +7377,7 @@ class HTTPSSessionTest : public testing::Test {
default_context_.set_cert_verifier(&cert_verifier_);
default_context_.Init();
}
- virtual ~HTTPSSessionTest() {}
+ ~HTTPSSessionTest() override {}
protected:
MockCertVerifier cert_verifier_;
@@ -7476,7 +7476,7 @@ class HTTPSOCSPTest : public HTTPSRequestTest {
kOCSPTestCertPolicy)) {
}
- virtual void SetUp() override {
+ void SetUp() override {
SetupContext(&context_);
context_.Init();
@@ -7513,7 +7513,7 @@ class HTTPSOCSPTest : public HTTPSRequestTest {
*out_cert_status = r->ssl_info().cert_status;
}
- virtual ~HTTPSOCSPTest() {
+ ~HTTPSOCSPTest() override {
#if defined(USE_NSS) || defined(OS_IOS)
ShutdownNSSHttpIO();
#endif
« no previous file with comments | « net/url_request/url_request_throttler_unittest.cc ('k') | net/websockets/websocket_basic_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698