diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-18 13:33:40 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-18 13:33:40 +0000 |
| commit | 6b2b6cf5057a90485f336d7f19f092f79042abd8 (patch) | |
| tree | 973ddc1c79045663fcf159bdc72ebd8ecc0256db | |
| parent | c61323ae2b5317b2ce1785057a36153712ec732d (diff) | |
| download | chromium_src-6b2b6cf5057a90485f336d7f19f092f79042abd8.zip chromium_src-6b2b6cf5057a90485f336d7f19f092f79042abd8.tar.gz chromium_src-6b2b6cf5057a90485f336d7f19f092f79042abd8.tar.bz2 | |
Fix the previous merge (100905).
URLRequestStatus still uses os_error(), not error(), on 874. Previous merge:
Merge 100905 - Retry contacting the dmserver if the first attempt failed due to a misconfigured proxy.
BUG=chromium-os:19431
TEST=See bug description
Review URL: http://codereview.chromium.org/7827022
TBR=joaodasilva@chromium.org
Review URL: http://codereview.chromium.org/7930016
git-svn-id: svn://svn.chromium.org/chrome/branches/874/src@101697 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/policy/device_management_service.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/policy/device_management_service.cc b/chrome/browser/policy/device_management_service.cc index e9b2921..3132cc5 100644 --- a/chrome/browser/policy/device_management_service.cc +++ b/chrome/browser/policy/device_management_service.cc @@ -212,7 +212,7 @@ void DeviceManagementService::OnURLFetchComplete( // Retry the job if it failed due to a broken proxy, by bypassing the // proxy on the next try. Don't retry if this URLFetcher already bypassed // the proxy. - int error = status.error(); + int error = status.os_error(); if (!status.is_success() && ((source->load_flags() & net::LOAD_BYPASS_PROXY) == 0) && (error == net::ERR_PROXY_CONNECTION_FAILED || |