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

webkit/blob/blob_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/blob/blob_url_request_job.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 27 matching lines @@
 static const char kHTTPPartialContentText[] = "Partial Content";
 static const char kHTTPNotAllowedText[] = "Not Allowed";
 static const char kHTTPNotFoundText[] = "Not Found";
 static const char kHTTPMethodNotAllowText[] = "Method Not Allowed";
 static const char kHTTPRequestedRangeNotSatisfiableText[] =
     "Requested Range Not Satisfiable";
 static const char kHTTPInternalErrorText[] = "Internal Server Error";
 
 static const int kFileOpenFlags = base::PLATFORM_FILE_OPEN |
                                   base::PLATFORM_FILE_READ |
                                   base::PLATFORM_FILE_ASYNC;

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

async

 
 BlobURLRequestJob::BlobURLRequestJob(
     net::URLRequest* request,
     BlobData* blob_data,
     base::MessageLoopProxy* file_thread_proxy)
     : net::URLRequestJob(request),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
       blob_data_(blob_data),
       file_thread_proxy_(file_thread_proxy),
       item_index_(0),
@@ skipping 36 matching lines @@
     return;
   }
 
   CountSize();
 }
 
 void BlobURLRequestJob::CloseStream() {
   if (stream_ != NULL) {
     // stream_.Close() blocks the IO thread, see http://crbug.com/75548.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
-    stream_->Close();
+    stream_->CloseSync();
     stream_.reset(NULL);
   }
 }
 
 void BlobURLRequestJob::Kill() {
   CloseStream();
 
   net::URLRequestJob::Kill();
   weak_factory_.InvalidateWeakPtrs();
 }
@@ skipping 206 matching lines @@
 
 void BlobURLRequestJob::DidOpen(base::PlatformFileError rv,
                                 base::PassPlatformFile file,
                                 bool created) {
   if (rv != base::PLATFORM_FILE_OK) {
     NotifyFailure(net::ERR_FAILED);
     return;
   }
 
   DCHECK(!stream_.get());
   stream_.reset(new net::FileStream(file.ReleaseValue(), kFileOpenFlags, NULL));

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

async.

 
   const BlobData::Item& item = blob_data_->items().at(item_index_);
   {
     // stream_.Seek() blocks the IO thread, see http://crbug.com/75548.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     int64 offset = current_item_offset_ + static_cast<int64>(item.offset);
     if (offset > 0 && offset != stream_->Seek(net::FROM_BEGIN, offset)) {
       NotifyFailure(net::ERR_FAILED);
       return;
     }
@@ skipping 217 matching lines @@
         // We don't support multiple range requests in one single URL request,
         // because we need to do multipart encoding here.
         // TODO(jianli): Support multipart byte range requests.
         NotifyFailure(net::ERR_REQUEST_RANGE_NOT_SATISFIABLE);
       }
     }
   }
 }
 
 }  // namespace webkit_blob