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 59% |
copy from content/shell/browser/shell_url_request_context_getter.h |
copy to extensions/browser/extension_url_request_context_getter.h |
index fefe1f71a5c4e2fc423e249c95d021b3bc704f2b..b0cc68f7a38467020f37807bb2e80eb10e749432 100644 |
--- a/content/shell/browser/shell_url_request_context_getter.h |
+++ b/extensions/browser/extension_url_request_context_getter.h |
@@ -2,10 +2,9 @@ |
// 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" |
@@ -18,54 +17,56 @@ 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 InfoMap; |
+ |
+class ExtensionURLRequestContextGetter : public net::URLRequestContextGetter { |
public: |
- ShellURLRequestContextGetter( |
+ explicit ExtensionURLRequestContextGetter( |
+ void* browser_context, |
bool ignore_certificate_errors, |
const base::FilePath& base_path, |
base::MessageLoop* io_loop, |
base::MessageLoop* file_loop, |
- ProtocolHandlerMap* protocol_handlers, |
- URLRequestInterceptorScopedVector request_interceptors, |
- net::NetLog* net_log); |
+ content::ProtocolHandlerMap* protocol_handlers, |
+ content::URLRequestInterceptorScopedVector request_interceptors, |
+ net::NetLog* net_log, |
+ InfoMap* extension_info_map); |
// net::URLRequestContextGetter implementation. |
virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE; |
virtual scoped_refptr<base::SingleThreadTaskRunner> |
GetNetworkTaskRunner() const OVERRIDE; |
- net::HostResolver* host_resolver(); |
- |
- protected: |
- virtual ~ShellURLRequestContextGetter(); |
- |
- private: |
+protected: |
+ virtual ~ExtensionURLRequestContextGetter(); |
+private: |
+ void* browser_context_; |
bool ignore_certificate_errors_; |
base::FilePath base_path_; |
base::MessageLoop* io_loop_; |
base::MessageLoop* file_loop_; |
net::NetLog* net_log_; |
+ InfoMap* extension_info_map_; |
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_; |
+ content::ProtocolHandlerMap protocol_handlers_; |
+ content::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_ |