diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 22:32:07 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 22:32:07 +0000 |
| commit | 5ab2191f4bf80656bdec435141531f18c07859c4 (patch) | |
| tree | 3f458c1f9cbba24a530cf2f1d4965c7e65517376 /net/url_request/url_request_file_job.cc | |
| parent | 2098fc80beaf21ef93d7fe3e886d185ce871b423 (diff) | |
| download | chromium_src-5ab2191f4bf80656bdec435141531f18c07859c4.zip chromium_src-5ab2191f4bf80656bdec435141531f18c07859c4.tar.gz chromium_src-5ab2191f4bf80656bdec435141531f18c07859c4.tar.bz2 | |
Back out r121064 from the trunk due to a compile failure.
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Builder%20%28dbg%29/builds/16/steps/compile/logs/stdio
net: Rename FileStream::Open/Close with OpenSync/CloseSync.
This is in preparation for implementing async versions of Open()
and Close().
The existing clients are changed to use OpenSync/CloseSync.
No logic is changed.
TEST=try bots to confirm everythign is built as before.
BUG=72001
Review URL: http://codereview.chromium.org/9349005
TBR=satorux@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9363036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121075 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_file_job.cc')
| -rw-r--r-- | net/url_request/url_request_file_job.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/url_request/url_request_file_job.cc b/net/url_request/url_request_file_job.cc index fa6d6a2..8f32750 100644 --- a/net/url_request/url_request_file_job.cc +++ b/net/url_request/url_request_file_job.cc @@ -161,7 +161,7 @@ void URLRequestFileJob::Kill() { // URL requests should not block on the disk! // http://code.google.com/p/chromium/issues/detail?id=59849 base::ThreadRestrictions::ScopedAllowIO allow_io; - stream_.CloseSync(); + stream_.Close(); if (async_resolver_) { async_resolver_->Cancel(); @@ -313,7 +313,7 @@ void URLRequestFileJob::DidResolve( int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ | base::PLATFORM_FILE_ASYNC; - rv = stream_.OpenSync(file_path_, flags); + rv = stream_.Open(file_path_, flags); } if (rv != OK) { |