diff options
| -rw-r--r-- | chrome/browser/io_thread.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/policy/device_management_service.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_service.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/sync/glue/http_bridge.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/glue/http_bridge.h | 5 | ||||
| -rw-r--r-- | chrome/test/base/testing_profile.cc | 3 | ||||
| -rw-r--r-- | content/common/net/url_fetcher_impl_unittest.cc | 5 | ||||
| -rw-r--r-- | content/shell/shell_url_request_context_getter.h | 4 | ||||
| -rw-r--r-- | remoting/host/url_request_context.h | 3 |
9 files changed, 25 insertions, 8 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 3229f7c..d0caeca 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -248,12 +248,14 @@ ConstructSystemRequestContext(IOThread::Globals* globals, class SystemURLRequestContextGetter : public net::URLRequestContextGetter { public: explicit SystemURLRequestContextGetter(IOThread* io_thread); - virtual ~SystemURLRequestContextGetter(); // Implementation for net::UrlRequestContextGetter. virtual net::URLRequestContext* GetURLRequestContext(); virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const; + protected: + virtual ~SystemURLRequestContextGetter(); + private: IOThread* const io_thread_; // Weak pointer, owned by BrowserProcess. scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_; diff --git a/chrome/browser/policy/device_management_service.cc b/chrome/browser/policy/device_management_service.cc index 474e8d1..90411bb 100644 --- a/chrome/browser/policy/device_management_service.cc +++ b/chrome/browser/policy/device_management_service.cc @@ -238,6 +238,9 @@ class DeviceManagementRequestContextGetter virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const OVERRIDE; + protected: + virtual ~DeviceManagementRequestContextGetter() {} + private: scoped_refptr<net::URLRequestContext> context_; scoped_refptr<net::URLRequestContextGetter> base_context_getter_; diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index 2c2e15b..8ab946eb 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -120,13 +120,15 @@ class SafeBrowsingURLRequestContextGetter public: explicit SafeBrowsingURLRequestContextGetter( SafeBrowsingService* sb_service_); - virtual ~SafeBrowsingURLRequestContextGetter(); // Implementation for net::UrlRequestContextGetter. virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE; virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const OVERRIDE; + protected: + virtual ~SafeBrowsingURLRequestContextGetter(); + private: SafeBrowsingService* const sb_service_; // Owned by BrowserProcess. scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_; diff --git a/chrome/browser/sync/glue/http_bridge.cc b/chrome/browser/sync/glue/http_bridge.cc index 0735b17..dc01ebf 100644 --- a/chrome/browser/sync/glue/http_bridge.cc +++ b/chrome/browser/sync/glue/http_bridge.cc @@ -30,6 +30,8 @@ HttpBridge::RequestContextGetter::RequestContextGetter( : baseline_context_getter_(baseline_context_getter) { } +HttpBridge::RequestContextGetter::~RequestContextGetter() {} + net::URLRequestContext* HttpBridge::RequestContextGetter::GetURLRequestContext() { // Lazily create the context. diff --git a/chrome/browser/sync/glue/http_bridge.h b/chrome/browser/sync/glue/http_bridge.h index c3b9c26..0eddab6 100644 --- a/chrome/browser/sync/glue/http_bridge.h +++ b/chrome/browser/sync/glue/http_bridge.h @@ -86,9 +86,10 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>, virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const OVERRIDE; - private: - virtual ~RequestContextGetter() {} + protected: + virtual ~RequestContextGetter(); + private: // User agent to apply to the net::URLRequestContext. std::string user_agent_; diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index 076f27d..385b0fe 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc @@ -119,6 +119,9 @@ class TestExtensionURLRequestContextGetter return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); } + protected: + virtual ~TestExtensionURLRequestContextGetter() {} + private: scoped_refptr<net::URLRequestContext> context_; }; diff --git a/content/common/net/url_fetcher_impl_unittest.cc b/content/common/net/url_fetcher_impl_unittest.cc index c00e561..ac5efa9 100644 --- a/content/common/net/url_fetcher_impl_unittest.cc +++ b/content/common/net/url_fetcher_impl_unittest.cc @@ -257,9 +257,10 @@ class CancelTestURLRequestContextGetter : public net::URLRequestContextGetter { context_created_.Wait(); } - private: - ~CancelTestURLRequestContextGetter() {} + protected: + virtual ~CancelTestURLRequestContextGetter() {} + private: scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_; base::WaitableEvent context_created_; scoped_refptr<net::URLRequestContext> context_; diff --git a/content/shell/shell_url_request_context_getter.h b/content/shell/shell_url_request_context_getter.h index 9f70dc6..4de8bb8 100644 --- a/content/shell/shell_url_request_context_getter.h +++ b/content/shell/shell_url_request_context_getter.h @@ -29,7 +29,6 @@ class ShellURLRequestContextGetter : public net::URLRequestContextGetter { const FilePath& base_path, MessageLoop* io_loop, MessageLoop* file_loop); - virtual ~ShellURLRequestContextGetter(); // net::URLRequestContextGetter implementation. virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE; @@ -38,6 +37,9 @@ class ShellURLRequestContextGetter : public net::URLRequestContextGetter { net::HostResolver* host_resolver(); + protected: + virtual ~ShellURLRequestContextGetter(); + private: FilePath base_path_; MessageLoop* io_loop_; diff --git a/remoting/host/url_request_context.h b/remoting/host/url_request_context.h index 4b356ca..a43d10d 100644 --- a/remoting/host/url_request_context.h +++ b/remoting/host/url_request_context.h @@ -46,9 +46,10 @@ class URLRequestContextGetter : public net::URLRequestContextGetter { virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const OVERRIDE; - private: + protected: virtual ~URLRequestContextGetter(); + private: scoped_refptr<net::URLRequestContext> url_request_context_; scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_; scoped_ptr<net::ProxyConfigService> proxy_config_service_; |