net: Rename FileStream::Open/Close with OpenSync/CloseSync.

webkit/fileapi/file_system_url_request_job.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/fileapi/file_system_url_request_job.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util_proxy.h"
@@ skipping 17 matching lines @@
 #include "webkit/fileapi/file_system_util.h"
 
 using net::URLRequest;
 using net::URLRequestJob;
 using net::URLRequestStatus;
 
 namespace fileapi {
 
 static const int kFileFlags = base::PLATFORM_FILE_OPEN |
                               base::PLATFORM_FILE_READ |
                               base::PLATFORM_FILE_ASYNC;

[satorux1, 2012/02/07 18:06:27]

async.

 
 static net::HttpResponseHeaders* CreateHttpResponseHeaders() {
   // HttpResponseHeaders expects its input string to be terminated by two NULs.
   static const char kStatus[] = "HTTP/1.1 200 OK\0";
   static const size_t kStatusLen = arraysize(kStatus);
 
   net::HttpResponseHeaders* headers =
       new net::HttpResponseHeaders(std::string(kStatus, kStatusLen));
 
   // Tell WebKit never to cache this content.
@@ skipping 67 matching lines @@
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
       stream_(NULL),
       is_directory_(false),
       remaining_bytes_(0) {
 }
 
 FileSystemURLRequestJob::~FileSystemURLRequestJob() {
   // Since we use the two-arg constructor of FileStream, we need to call Close()
   // manually: ~FileStream won't call it for us.
   if (stream_ != NULL)
-    stream_->Close();
+    stream_->CloseSync();
 }
 
 void FileSystemURLRequestJob::Start() {
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&FileSystemURLRequestJob::StartAsync,
                  weak_factory_.GetWeakPtr()));
 }
 
 void FileSystemURLRequestJob::Kill() {
   if (stream_ != NULL) {
-    stream_->Close();
+    stream_->CloseSync();
     stream_.reset(NULL);
   }
   URLRequestJob::Kill();
   weak_factory_.InvalidateWeakPtrs();
 }
 
 bool FileSystemURLRequestJob::ReadRawData(net::IOBuffer* dest, int dest_size,
                                           int *bytes_read) {
   DCHECK_NE(dest_size, 0);
   DCHECK(bytes_read);
@@ skipping 111 matching lines @@
 }
 
 void FileSystemURLRequestJob::DidOpen(base::PlatformFileError error_code,
                                       base::PassPlatformFile file,
                                       bool created) {
   if (error_code != base::PLATFORM_FILE_OK) {
     NotifyFailed(error_code);
     return;
   }
 
   stream_.reset(new net::FileStream(file.ReleaseValue(), kFileFlags, NULL));

[satorux1, 2012/02/07 18:06:27]

async.

 
   remaining_bytes_ = byte_range_.last_byte_position() -
                      byte_range_.first_byte_position() + 1;
   DCHECK_GE(remaining_bytes_, 0);
 
   // TODO(adamk): Please remove this ScopedAllowIO once we support async seek on
   // FileStream.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   // Do the seek at the beginning of the request.
   if (remaining_bytes_ > 0 &&
@@ skipping 40 matching lines @@
   }
 
   return false;
 }
 
 void FileSystemURLRequestJob::NotifyFailed(int rv) {
   NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, rv));
 }
 
 }  // namespace fileapi