diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 12:02:05 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 12:02:05 +0000 |
| commit | d0cc35b709d89775928ed5e588914837f4ca6c6c (patch) | |
| tree | 771160b2ed2406a42df207687af0c8ed7cc134d4 /chrome_frame | |
| parent | f5d75f7d779dbc8bdc234f24a0c5e0bad1df40b2 (diff) | |
| download | chromium_src-d0cc35b709d89775928ed5e588914837f4ca6c6c.zip chromium_src-d0cc35b709d89775928ed5e588914837f4ca6c6c.tar.gz chromium_src-d0cc35b709d89775928ed5e588914837f4ca6c6c.tar.bz2 | |
net: Rename URLRequestStatus::os_error_.
BUG=92264
TEST=None
R=willchan@chromium.org
Review URL: http://codereview.chromium.org/7846007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/url_request_test.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/urlmon_url_request_private.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/test/url_request_test.cc b/chrome_frame/test/url_request_test.cc index ab90f47..86093b6 100644 --- a/chrome_frame/test/url_request_test.cc +++ b/chrome_frame/test/url_request_test.cc @@ -189,7 +189,7 @@ TEST(UrlmonUrlRequestTest, UnreachableUrl) { .WillOnce(QUIT_LOOP_SOON(loop, 2)); EXPECT_CALL(mock, OnResponseEnd(1, testing::Property( - &net::URLRequestStatus::os_error, + &net::URLRequestStatus::error, net::ERR_TUNNEL_CONNECTION_FAILED))) .Times(testing::AtMost(1)); diff --git a/chrome_frame/urlmon_url_request_private.h b/chrome_frame/urlmon_url_request_private.h index adf818d..f378d8f 100644 --- a/chrome_frame/urlmon_url_request_private.h +++ b/chrome_frame/urlmon_url_request_private.h @@ -210,15 +210,15 @@ class UrlmonUrlRequest return result_; } - void set_result(net::URLRequestStatus::Status status, int os_error) { + void set_result(net::URLRequestStatus::Status status, int error) { result_.set_status(status); - result_.set_os_error(os_error); + result_.set_error(error); } void set_result(HRESULT hr) { result_.set_status(FAILED(hr)? net::URLRequestStatus::FAILED: net::URLRequestStatus::SUCCESS); - result_.set_os_error(HresultToNetError(hr)); + result_.set_error(HresultToNetError(hr)); } private: |