Chromium Code Reviews| Index: chrome/browser/policy/device_management_backend_impl.cc |
| =================================================================== |
| --- chrome/browser/policy/device_management_backend_impl.cc (revision 65207) |
| +++ chrome/browser/policy/device_management_backend_impl.cc (working copy) |
| @@ -51,7 +51,8 @@ |
| // (i.e. before the profile has been loaded). |
| class DeviceManagementBackendRequestContext : public URLRequestContext { |
| public: |
| - explicit DeviceManagementBackendRequestContext(IOThread::Globals* io_globals); |
| + explicit DeviceManagementBackendRequestContext(net::NetLog* net_log, |
|
eroman
2010/11/18 18:04:03
remove "explicit".
|
| + IOThread::Globals* io_globals); |
| virtual ~DeviceManagementBackendRequestContext(); |
| private: |
| @@ -61,8 +62,8 @@ |
| }; |
| DeviceManagementBackendRequestContext::DeviceManagementBackendRequestContext( |
| - IOThread::Globals* io_globals) { |
| - net_log_ = io_globals->net_log.get(); |
| + net::NetLog* net_log, IOThread::Globals* io_globals) { |
| + net_log_ = net_log; |
| host_resolver_ = io_globals->host_resolver.get(); |
| proxy_service_ = net::ProxyService::CreateDirect(); |
| ssl_config_service_ = net::SSLConfigService::CreateSystemSSLConfigService(); |
| @@ -114,7 +115,8 @@ |
| URLRequestContext* |
| DeviceManagementBackendRequestContextGetter::GetURLRequestContext() { |
| if (!context_) |
| - context_ = new DeviceManagementBackendRequestContext(io_thread_->globals()); |
| + context_ = new DeviceManagementBackendRequestContext(io_thread_->net_log(), |
| + io_thread_->globals()); |
| return context_.get(); |
| } |
| Property changes on: chrome\browser\policy\device_management_backend_impl.cc |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| + LF |