Chromium Code Reviews| Index: chrome/service/net/service_url_request_context.h |
| diff --git a/chrome/service/net/service_url_request_context.h b/chrome/service/net/service_url_request_context.h |
| index 1578f234cec60a2fc708e5705e1202a9f2975d37..1bbbce4c86a85fa50cc5a2285d39bbc605bdcd09 100644 |
| --- a/chrome/service/net/service_url_request_context.h |
| +++ b/chrome/service/net/service_url_request_context.h |
| @@ -40,12 +40,11 @@ class ServiceURLRequestContext : public net::URLRequestContext { |
| const std::string& user_agent, |
| net::ProxyConfigService* net_proxy_config_service); |
| + virtual ~ServiceURLRequestContext(); |
| + |
| // Overridden from net::URLRequestContext: |
| virtual const std::string& GetUserAgent(const GURL& url) const OVERRIDE; |
| - protected: |
| - virtual ~ServiceURLRequestContext(); |
| - |
| private: |
| std::string user_agent_; |
| net::URLRequestContextStorage storage_; |
| @@ -70,7 +69,7 @@ class ServiceURLRequestContextGetter : public net::URLRequestContextGetter { |
| virtual ~ServiceURLRequestContextGetter(); |
| std::string user_agent_; |
| - scoped_refptr<net::URLRequestContext> url_request_context_; |
| + scoped_ptr<net::URLRequestContext> url_request_context_; |
| scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_; |
| scoped_ptr<net::ProxyConfigService> proxy_config_service_; |
|
eroman
2012/05/04 04:27:02
I expect the proxy_config_service_ should outlive
|
| }; |