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/base/upload_data.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/base/upload_data.cc')
| -rw-r--r-- | net/base/upload_data.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/base/upload_data.cc b/net/base/upload_data.cc index bffe13b..908fb2d 100644 --- a/net/base/upload_data.cc +++ b/net/base/upload_data.cc @@ -31,7 +31,7 @@ UploadData::Element::~Element() { if (file_stream_) { // Temporarily allow until fix: http://crbug.com/72001. base::ThreadRestrictions::ScopedAllowIO allow_io; - file_stream_->CloseSync(); + file_stream_->Close(); delete file_stream_; } } @@ -107,9 +107,8 @@ FileStream* UploadData::Element::NewFileStreamForReading() { base::ThreadRestrictions::ScopedAllowIO allow_io; scoped_ptr<FileStream> file(new FileStream(NULL)); - int64 rv = file->OpenSync( - file_path_, - base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ); + int64 rv = file->Open(file_path_, + base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ); if (rv != OK) { // If the file can't be opened, we'll just upload an empty file. DLOG(WARNING) << "Failed to open \"" << file_path_.value() |