Index: storage/browser/blob/local_file_stream_reader.cc |
diff --git a/webkit/browser/blob/local_file_stream_reader.cc b/storage/browser/blob/local_file_stream_reader.cc |
similarity index 75% |
rename from webkit/browser/blob/local_file_stream_reader.cc |
rename to storage/browser/blob/local_file_stream_reader.cc |
index 2ccc3fbdf338efc6d88037df8c693326ec526788..ecfc8dd59d8ecb6a84ca62ef653b8049013364c3 100644 |
--- a/webkit/browser/blob/local_file_stream_reader.cc |
+++ b/storage/browser/blob/local_file_stream_reader.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "webkit/browser/blob/local_file_stream_reader.h" |
+#include "storage/browser/blob/local_file_stream_reader.h" |
#include "base/file_util.h" |
#include "base/files/file_util_proxy.h" |
@@ -13,13 +13,12 @@ |
#include "net/base/io_buffer.h" |
#include "net/base/net_errors.h" |
-namespace webkit_blob { |
+namespace storage { |
namespace { |
-const int kOpenFlagsForRead = base::File::FLAG_OPEN | |
- base::File::FLAG_READ | |
- base::File::FLAG_ASYNC; |
+const int kOpenFlagsForRead = |
+ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_ASYNC; |
} // namespace |
@@ -28,21 +27,24 @@ FileStreamReader* FileStreamReader::CreateForLocalFile( |
const base::FilePath& file_path, |
int64 initial_offset, |
const base::Time& expected_modification_time) { |
- return new LocalFileStreamReader(task_runner, file_path, initial_offset, |
- expected_modification_time); |
+ return new LocalFileStreamReader( |
+ task_runner, file_path, initial_offset, expected_modification_time); |
} |
LocalFileStreamReader::~LocalFileStreamReader() { |
} |
-int LocalFileStreamReader::Read(net::IOBuffer* buf, int buf_len, |
- const net::CompletionCallback& callback) { |
+int LocalFileStreamReader::Read(net::IOBuffer* buf, |
+ int buf_len, |
+ const net::CompletionCallback& callback) { |
DCHECK(!has_pending_open_); |
if (stream_impl_) |
return stream_impl_->Read(buf, buf_len, callback); |
return Open(base::Bind(&LocalFileStreamReader::DidOpenForRead, |
weak_factory_.GetWeakPtr(), |
- make_scoped_refptr(buf), buf_len, callback)); |
+ make_scoped_refptr(buf), |
+ buf_len, |
+ callback)); |
} |
int64 LocalFileStreamReader::GetLength( |
@@ -67,7 +69,8 @@ LocalFileStreamReader::LocalFileStreamReader( |
initial_offset_(initial_offset), |
expected_modification_time_(expected_modification_time), |
has_pending_open_(false), |
- weak_factory_(this) {} |
+ weak_factory_(this) { |
+} |
int LocalFileStreamReader::Open(const net::CompletionCallback& callback) { |
DCHECK(!has_pending_open_); |
@@ -77,7 +80,8 @@ int LocalFileStreamReader::Open(const net::CompletionCallback& callback) { |
// Call GetLength first to make it perform last-modified-time verification, |
// and then call DidVerifyForOpen for do the rest. |
return GetLength(base::Bind(&LocalFileStreamReader::DidVerifyForOpen, |
- weak_factory_.GetWeakPtr(), callback)); |
+ weak_factory_.GetWeakPtr(), |
+ callback)); |
} |
void LocalFileStreamReader::DidVerifyForOpen( |
@@ -89,11 +93,12 @@ void LocalFileStreamReader::DidVerifyForOpen( |
} |
stream_impl_.reset(new net::FileStream(task_runner_)); |
- const int result = stream_impl_->Open( |
- file_path_, kOpenFlagsForRead, |
- base::Bind(&LocalFileStreamReader::DidOpenFileStream, |
- weak_factory_.GetWeakPtr(), |
- callback)); |
+ const int result = |
+ stream_impl_->Open(file_path_, |
+ kOpenFlagsForRead, |
+ base::Bind(&LocalFileStreamReader::DidOpenFileStream, |
+ weak_factory_.GetWeakPtr(), |
+ callback)); |
if (result != net::ERR_IO_PENDING) |
callback.Run(result); |
} |
@@ -105,11 +110,12 @@ void LocalFileStreamReader::DidOpenFileStream( |
callback.Run(result); |
return; |
} |
- result = stream_impl_->Seek( |
- base::File::FROM_BEGIN, initial_offset_, |
- base::Bind(&LocalFileStreamReader::DidSeekFileStream, |
- weak_factory_.GetWeakPtr(), |
- callback)); |
+ result = |
+ stream_impl_->Seek(base::File::FROM_BEGIN, |
+ initial_offset_, |
+ base::Bind(&LocalFileStreamReader::DidSeekFileStream, |
+ weak_factory_.GetWeakPtr(), |
+ callback)); |
if (result != net::ERR_IO_PENDING) { |
callback.Run(result); |
} |
@@ -166,4 +172,4 @@ void LocalFileStreamReader::DidGetFileInfoForGetLength( |
callback.Run(file_info.size); |
} |
-} // namespace webkit_blob |
+} // namespace storage |