Update to Chromium revision 194165.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1221 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-04-15 22:16:01 +00:00
parent 414befcd92
commit bb6eeee686
47 changed files with 154 additions and 121 deletions

View File

@@ -18,9 +18,9 @@
#include "net/url_request/url_request_context_getter.h"
#include "net/url_request/url_request_job_factory.h"
class CefRequestInterceptor;
class CefURLRequestContextProxy;
namespace base {
class MessageLoop;
}
namespace net {
class HostResolver;
@@ -31,6 +31,9 @@ class URLRequestJobFactoryImpl;
class URLSecurityManager;
}
class CefRequestInterceptor;
class CefURLRequestContextProxy;
/*
// Classes used in network request processing:
//
@@ -75,8 +78,8 @@ class URLSecurityManager;
class CefURLRequestContextGetter : public net::URLRequestContextGetter {
public:
CefURLRequestContextGetter(
MessageLoop* io_loop,
MessageLoop* file_loop,
base::MessageLoop* io_loop,
base::MessageLoop* file_loop,
content::ProtocolHandlerMap* protocol_handlers);
virtual ~CefURLRequestContextGetter();
@@ -103,8 +106,8 @@ class CefURLRequestContextGetter : public net::URLRequestContextGetter {
private:
void CreateProxyConfigService();
MessageLoop* io_loop_;
MessageLoop* file_loop_;
base::MessageLoop* io_loop_;
base::MessageLoop* file_loop_;
scoped_ptr<net::ProxyConfigService> proxy_config_service_;
scoped_ptr<CefRequestInterceptor> request_interceptor_;