diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 19:45:41 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 19:45:41 +0000 |
| commit | f6c21cb31f1b7bd4e8873a55e9954eece1fddda5 (patch) | |
| tree | 6430a3c5eff0decfd793e7912e5e5fe7bb04a838 /chrome/browser/policy/device_management_service.cc | |
| parent | 64cd5c20952c3ae6ebb83a9ea3760795f5c5c0dc (diff) | |
| download | chromium_src-f6c21cb31f1b7bd4e8873a55e9954eece1fddda5.zip chromium_src-f6c21cb31f1b7bd4e8873a55e9954eece1fddda5.tar.gz chromium_src-f6c21cb31f1b7bd4e8873a55e9954eece1fddda5.tar.bz2 | |
Reland r74842
Merged correctly this time.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6523067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy/device_management_service.cc')
| -rw-r--r-- | chrome/browser/policy/device_management_service.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/chrome/browser/policy/device_management_service.cc b/chrome/browser/policy/device_management_service.cc index 965a42c..dc26e6f 100644 --- a/chrome/browser/policy/device_management_service.cc +++ b/chrome/browser/policy/device_management_service.cc @@ -42,27 +42,26 @@ DeviceManagementRequestContext::DeviceManagementRequestContext( // Share resolver, proxy service and ssl bits with the baseline context. This // is important so we don't make redundant requests (e.g. when resolving proxy // auto configuration). - net_log_ = base_context->net_log(); - host_resolver_ = base_context->host_resolver(); - proxy_service_ = base_context->proxy_service(); - ssl_config_service_ = base_context->ssl_config_service(); + set_net_log(base_context->net_log()); + set_host_resolver(base_context->host_resolver()); + set_proxy_service(base_context->proxy_service()); + set_ssl_config_service(base_context->ssl_config_service()); // Share the http session. - http_transaction_factory_ = + set_http_transaction_factory( new net::HttpNetworkLayer( - base_context->http_transaction_factory()->GetSession()); + base_context->http_transaction_factory()->GetSession())); // No cookies, please. - cookie_store_ = new net::CookieMonster(NULL, NULL); + set_cookie_store(new net::CookieMonster(NULL, NULL)); // Initialize these to sane values for our purposes. - accept_language_ = "*"; - accept_charset_ = "*"; + set_accept_language("*"); + set_accept_charset("*"); } DeviceManagementRequestContext::~DeviceManagementRequestContext() { - delete http_transaction_factory_; - delete http_auth_handler_factory_; + delete http_transaction_factory(); } const std::string& DeviceManagementRequestContext::GetUserAgent( |