diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-28 09:29:28 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-28 09:29:28 +0000 |
commit | a981330295415845ef13cd85afeff42032d782df (patch) | |
tree | 46ad72c4cabd094a5f4dea2faa1bde6fb7d3677f /net/url_request | |
parent | 20eef6d14fce11a57949d052db064e56242c4c82 (diff) | |
download | chromium_src-a981330295415845ef13cd85afeff42032d782df.zip chromium_src-a981330295415845ef13cd85afeff42032d782df.tar.gz chromium_src-a981330295415845ef13cd85afeff42032d782df.tar.bz2 |
RefCounted types should not have public destructors, net/
BUG=123295
TEST=none
Review URL: http://codereview.chromium.org/10066045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r-- | net/url_request/url_request_job_factory_unittest.cc | 20 | ||||
-rw-r--r-- | net/url_request/url_request_netlog_params.cc | 4 | ||||
-rw-r--r-- | net/url_request/url_request_netlog_params.h | 5 | ||||
-rw-r--r-- | net/url_request/url_request_throttler_entry.cc | 3 | ||||
-rw-r--r-- | net/url_request/url_request_throttler_simulation_unittest.cc | 6 | ||||
-rw-r--r-- | net/url_request/url_request_throttler_unittest.cc | 4 | ||||
-rw-r--r-- | net/url_request/url_request_unittest.cc | 6 | ||||
-rw-r--r-- | net/url_request/view_cache_helper_unittest.cc | 5 |
8 files changed, 38 insertions, 15 deletions
diff --git a/net/url_request/url_request_job_factory_unittest.cc b/net/url_request/url_request_job_factory_unittest.cc index 509df08..1273256 100644 --- a/net/url_request/url_request_job_factory_unittest.cc +++ b/net/url_request/url_request_job_factory_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -21,7 +21,7 @@ class MockURLRequestJob : public URLRequestJob { status_(status), ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {} - virtual void Start() { + virtual void Start() OVERRIDE { // Start reading asynchronously so that all error reporting and data // callbacks happen as they would for network requests. MessageLoop::current()->PostTask( @@ -30,6 +30,9 @@ class MockURLRequestJob : public URLRequestJob { weak_factory_.GetWeakPtr())); } + protected: + virtual ~MockURLRequestJob() {} + private: void StartAsync() { SetStatus(status_); @@ -42,7 +45,7 @@ class MockURLRequestJob : public URLRequestJob { class DummyProtocolHandler : public URLRequestJobFactory::ProtocolHandler { public: - virtual URLRequestJob* MaybeCreateJob(URLRequest* request) const { + virtual URLRequestJob* MaybeCreateJob(URLRequest* request) const OVERRIDE { return new MockURLRequestJob( request, URLRequestStatus(URLRequestStatus::SUCCESS, OK)); } @@ -52,9 +55,10 @@ class DummyInterceptor : public URLRequestJobFactory::Interceptor { public: DummyInterceptor() : did_intercept_(false), - handle_all_protocols_(false) { } + handle_all_protocols_(false) { + } - virtual URLRequestJob* MaybeIntercept(URLRequest* request) const { + virtual URLRequestJob* MaybeIntercept(URLRequest* request) const OVERRIDE { did_intercept_ = true; return new MockURLRequestJob( request, @@ -63,17 +67,17 @@ class DummyInterceptor : public URLRequestJobFactory::Interceptor { virtual URLRequestJob* MaybeInterceptRedirect( const GURL& /* location */, - URLRequest* /* request */) const { + URLRequest* /* request */) const OVERRIDE { return NULL; } virtual URLRequestJob* MaybeInterceptResponse( - URLRequest* /* request */) const { + URLRequest* /* request */) const OVERRIDE { return NULL; } virtual bool WillHandleProtocol( - const std::string& /* protocol */) const { + const std::string& /* protocol */) const OVERRIDE { return handle_all_protocols_; } diff --git a/net/url_request/url_request_netlog_params.cc b/net/url_request/url_request_netlog_params.cc index 42076bc..29143ba 100644 --- a/net/url_request/url_request_netlog_params.cc +++ b/net/url_request/url_request_netlog_params.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -28,4 +28,6 @@ Value* URLRequestStartEventParameters::ToValue() const { return dict; } +URLRequestStartEventParameters::~URLRequestStartEventParameters() {} + } // namespace net diff --git a/net/url_request/url_request_netlog_params.h b/net/url_request/url_request_netlog_params.h index 9f0d574..d084f24 100644 --- a/net/url_request/url_request_netlog_params.h +++ b/net/url_request/url_request_netlog_params.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -35,6 +35,9 @@ class NET_EXPORT URLRequestStartEventParameters virtual base::Value* ToValue() const OVERRIDE; + protected: + virtual ~URLRequestStartEventParameters(); + private: const GURL url_; const std::string method_; diff --git a/net/url_request/url_request_throttler_entry.cc b/net/url_request/url_request_throttler_entry.cc index ece2b8b..60c6154 100644 --- a/net/url_request/url_request_throttler_entry.cc +++ b/net/url_request/url_request_throttler_entry.cc @@ -68,6 +68,9 @@ class RejectedRequestParameters : public NetLog::EventParameters { return dict; } + protected: + virtual ~RejectedRequestParameters() {} + private: std::string url_id_; int num_failures_; diff --git a/net/url_request/url_request_throttler_simulation_unittest.cc b/net/url_request/url_request_throttler_simulation_unittest.cc index 5ee1746..256d343 100644 --- a/net/url_request/url_request_throttler_simulation_unittest.cc +++ b/net/url_request/url_request_throttler_simulation_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -299,7 +299,6 @@ class MockURLRequestThrottlerEntry : public URLRequestThrottlerEntry { : URLRequestThrottlerEntry(manager, ""), mock_backoff_entry_(&backoff_policy_) { } - virtual ~MockURLRequestThrottlerEntry() {} virtual const BackoffEntry* GetBackoffEntry() const OVERRIDE { return &mock_backoff_entry_; @@ -322,6 +321,9 @@ class MockURLRequestThrottlerEntry : public URLRequestThrottlerEntry { return fake_now_; } + protected: + virtual ~MockURLRequestThrottlerEntry() {} + private: TimeTicks fake_now_; MockBackoffEntry mock_backoff_entry_; diff --git a/net/url_request/url_request_throttler_unittest.cc b/net/url_request/url_request_throttler_unittest.cc index 88243db..11a1f76 100644 --- a/net/url_request/url_request_throttler_unittest.cc +++ b/net/url_request/url_request_throttler_unittest.cc @@ -49,7 +49,6 @@ class MockURLRequestThrottlerEntry : public URLRequestThrottlerEntry { set_exponential_backoff_release_time(exponential_backoff_release_time); set_sliding_window_release_time(sliding_window_release_time); } - virtual ~MockURLRequestThrottlerEntry() {} void InitPolicy() { // Some tests become flaky if we have jitter. @@ -101,6 +100,9 @@ class MockURLRequestThrottlerEntry : public URLRequestThrottlerEntry { TimeTicks fake_time_now_; MockBackoffEntry mock_backoff_entry_; + + protected: + virtual ~MockURLRequestThrottlerEntry() {} }; class MockURLRequestThrottlerManager : public URLRequestThrottlerManager { diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 7126fa3..d53c01c 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -1418,12 +1418,16 @@ class TestSSLConfigService : public SSLConfigService { online_rev_checking_(online_rev_checking) { } - virtual void GetSSLConfig(SSLConfig* config) { + // SSLConfigService: + virtual void GetSSLConfig(SSLConfig* config) OVERRIDE { *config = SSLConfig(); config->rev_checking_enabled = online_rev_checking_; config->verify_ev_cert = ev_enabled_; } + protected: + virtual ~TestSSLConfigService() {} + private: const bool ev_enabled_; const bool online_rev_checking_; diff --git a/net/url_request/view_cache_helper_unittest.cc b/net/url_request/view_cache_helper_unittest.cc index a8c0822..dbb813d 100644 --- a/net/url_request/view_cache_helper_unittest.cc +++ b/net/url_request/view_cache_helper_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -23,6 +23,9 @@ class TestURLRequestContext : public URLRequestContext { // Gets a pointer to the cache backend. disk_cache::Backend* GetBackend(); + protected: + virtual ~TestURLRequestContext() {} + private: HttpCache cache_; }; |