summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 22:32:07 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 22:32:07 +0000
commit5ab2191f4bf80656bdec435141531f18c07859c4 (patch)
tree3f458c1f9cbba24a530cf2f1d4965c7e65517376 /webkit/tools
parent2098fc80beaf21ef93d7fe3e886d185ce871b423 (diff)
downloadchromium_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 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/simple_resource_loader_bridge.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index 8f76c2b..1dd138e 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -332,7 +332,7 @@ class RequestProxy : public net::URLRequest::Delegate,
if (file_util::CreateTemporaryFile(&path)) {
downloaded_file_ = DeletableFileReference::GetOrCreate(
path, base::MessageLoopProxy::current());
- file_stream_.OpenSync(
+ file_stream_.Open(
path, base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_WRITE);
}
}
@@ -426,7 +426,7 @@ class RequestProxy : public net::URLRequest::Delegate,
const std::string& security_info,
const base::TimeTicks& complete_time) {
if (download_to_file_)
- file_stream_.CloseSync();
+ file_stream_.Close();
owner_loop_->PostTask(
FROM_HERE,
base::Bind(&RequestProxy::NotifyCompletedRequest, this, status,
@@ -732,7 +732,7 @@ class SyncRequestProxy : public RequestProxy {
const std::string& security_info,
const base::TimeTicks& complete_time) {
if (download_to_file_)
- file_stream_.CloseSync();
+ file_stream_.Close();
result_->status = status;
event_.Signal();
}