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 /chrome/common | |
| 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 'chrome/common')
| -rw-r--r-- | chrome/common/zip.cc | 2 | ||||
| -rw-r--r-- | chrome/common/zip_reader.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/common/zip.cc b/chrome/common/zip.cc index 1da9cff..a5635c0 100644 --- a/chrome/common/zip.cc +++ b/chrome/common/zip.cc @@ -20,7 +20,7 @@ namespace { bool AddFileToZip(zipFile zip_file, const FilePath& src_dir) { net::FileStream stream(NULL); int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ; - if (stream.OpenSync(src_dir, flags) != 0) { + if (stream.Open(src_dir, flags) != 0) { DLOG(ERROR) << "Could not open stream for path " << src_dir.value(); return false; diff --git a/chrome/common/zip_reader.cc b/chrome/common/zip_reader.cc index c89ce29..60fba5e 100644 --- a/chrome/common/zip_reader.cc +++ b/chrome/common/zip_reader.cc @@ -193,7 +193,7 @@ bool ZipReader::ExtractCurrentEntryToFilePath( net::FileStream stream(NULL); const int flags = (base::PLATFORM_FILE_CREATE_ALWAYS | base::PLATFORM_FILE_WRITE); - if (stream.OpenSync(output_file_path, flags) != 0) + if (stream.Open(output_file_path, flags) != 0) return false; bool success = true; // This becomes false when something bad happens. @@ -218,7 +218,7 @@ bool ZipReader::ExtractCurrentEntryToFilePath( } } - stream.CloseSync(); + stream.Close(); unzCloseCurrentFile(zip_file_); return success; } |