Chromium Code Reviews| Index: extensions/browser/extension_url_request_context_getter.h |
| diff --git a/content/shell/browser/shell_url_request_context_getter.h b/extensions/browser/extension_url_request_context_getter.h |
| similarity index 22% |
| copy from content/shell/browser/shell_url_request_context_getter.h |
| copy to extensions/browser/extension_url_request_context_getter.h |
| index fefe1f71a5c4e2fc423e249c95d021b3bc704f2b..740f00889b2e609378ec9bc8e071657470e9541a 100644 |
| --- a/content/shell/browser/shell_url_request_context_getter.h |
| +++ b/extensions/browser/extension_url_request_context_getter.h |
| @@ -2,70 +2,45 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef CONTENT_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_ |
| -#define CONTENT_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_ |
| +#ifndef EXTENSIONS_BROWSER_EXTENSION_URL_REQUEST_CONTEXT_GETTER_H_ |
| +#define EXTENSIONS_BROWSER_EXTENSION_URL_REQUEST_CONTEXT_GETTER_H_ |
| -#include "base/compiler_specific.h" |
| #include "base/files/file_path.h" |
| -#include "base/memory/ref_counted.h" |
| -#include "base/memory/scoped_ptr.h" |
| -#include "content/public/browser/content_browser_client.h" |
| -#include "net/url_request/url_request_context_getter.h" |
| -#include "net/url_request/url_request_job_factory.h" |
| +#include "content/shell/browser/shell_url_request_context_getter.h" |
| namespace base { |
| class MessageLoop; |
| } |
| namespace net { |
| -class HostResolver; |
| -class MappedHostResolver; |
| class NetworkDelegate; |
| class NetLog; |
| -class ProxyConfigService; |
| -class URLRequestContextStorage; |
| } |
| -namespace content { |
| +namespace extensions { |
| -class ShellURLRequestContextGetter : public net::URLRequestContextGetter { |
| +class ExtensionURLRequestContextGetter : |
| + public content::ShellURLRequestContextGetter { |
|
Fady Samuel
2014/09/29 20:43:55
Don't rely on code from ShellURLRequestContextGett
|
| public: |
| - ShellURLRequestContextGetter( |
| + //ExtensionURLRequestContextGetter() {} |
| + explicit ExtensionURLRequestContextGetter( |
|
Fady Samuel
2014/09/29 20:43:55
Remove explicit.
|
| bool ignore_certificate_errors, |
| const base::FilePath& base_path, |
| base::MessageLoop* io_loop, |
| base::MessageLoop* file_loop, |
| - ProtocolHandlerMap* protocol_handlers, |
| - URLRequestInterceptorScopedVector request_interceptors, |
| + content::ProtocolHandlerMap* protocol_handlers, |
| + content::URLRequestInterceptorScopedVector request_interceptors, |
| net::NetLog* net_log); |
| - // net::URLRequestContextGetter implementation. |
| - virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE; |
| - virtual scoped_refptr<base::SingleThreadTaskRunner> |
| - GetNetworkTaskRunner() const OVERRIDE; |
| + // content::ShellURLRequestContextGetter implementation. |
| + virtual net::NetworkDelegate* CreateNetworkDelegate() OVERRIDE; |
| +protected: |
| + virtual ~ExtensionURLRequestContextGetter(); |
| - net::HostResolver* host_resolver(); |
| - |
| - protected: |
| - virtual ~ShellURLRequestContextGetter(); |
| - |
| - private: |
| - bool ignore_certificate_errors_; |
| - base::FilePath base_path_; |
| - base::MessageLoop* io_loop_; |
| - base::MessageLoop* file_loop_; |
| - net::NetLog* net_log_; |
| - |
| - scoped_ptr<net::ProxyConfigService> proxy_config_service_; |
| - scoped_ptr<net::NetworkDelegate> network_delegate_; |
| - scoped_ptr<net::URLRequestContextStorage> storage_; |
| - scoped_ptr<net::URLRequestContext> url_request_context_; |
| - ProtocolHandlerMap protocol_handlers_; |
| - URLRequestInterceptorScopedVector request_interceptors_; |
| - |
| - DISALLOW_COPY_AND_ASSIGN(ShellURLRequestContextGetter); |
| +private: |
| + DISALLOW_COPY_AND_ASSIGN(ExtensionURLRequestContextGetter); |
| }; |
| -} // namespace content |
| +} // namespace extensions |
| -#endif // CONTENT_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_ |
| +#endif // EXTENSIONS_BROWSER_EXTENSION_URL_REQUEST_CONTEXT_GETTER_H_ |