Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/drive/drive_url_request_job.h" | 5 #include "chrome/browser/chromeos/drive/drive_url_request_job.h" |
| 6 | 6 |
| 7 #include <algorithm> | |
| 7 #include <string> | 8 #include <string> |
| 9 #include <vector> | |
| 8 | 10 |
| 9 #include "base/bind.h" | 11 #include "base/bind.h" |
| 10 #include "base/logging.h" | 12 #include "base/logging.h" |
| 11 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/ref_counted.h" |
| 12 #include "chrome/browser/chromeos/drive/drive.pb.h" | 14 #include "chrome/browser/browser_process.h" |
| 13 #include "chrome/browser/chromeos/drive/drive_file_stream_reader.h" | |
| 14 #include "chrome/browser/chromeos/drive/file_system_interface.h" | |
| 15 #include "chrome/browser/chromeos/drive/file_system_util.h" | 15 #include "chrome/browser/chromeos/drive/file_system_util.h" |
| 16 #include "chrome/browser/extensions/api/file_handlers/mime_util.h" | |
| 17 #include "chrome/browser/profiles/profile_manager.h" | |
| 18 #include "chrome/common/url_constants.h" | |
| 16 #include "content/public/browser/browser_thread.h" | 19 #include "content/public/browser/browser_thread.h" |
| 20 #include "content/public/browser/storage_partition.h" | |
| 17 #include "net/base/net_errors.h" | 21 #include "net/base/net_errors.h" |
| 18 #include "net/http/http_byte_range.h" | 22 #include "net/http/http_byte_range.h" |
| 19 #include "net/http/http_request_headers.h" | 23 #include "net/http/http_request_headers.h" |
| 20 #include "net/http/http_response_info.h" | 24 #include "net/http/http_response_info.h" |
| 21 #include "net/http/http_util.h" | 25 #include "net/http/http_util.h" |
| 22 #include "net/url_request/url_request.h" | 26 #include "net/url_request/url_request.h" |
| 23 #include "net/url_request/url_request_status.h" | 27 #include "net/url_request/url_request_status.h" |
| 28 #include "storage/browser/fileapi/file_system_backend.h" | |
| 29 #include "storage/browser/fileapi/file_system_context.h" | |
| 30 #include "storage/browser/fileapi/file_system_operation_runner.h" | |
| 24 | 31 |
| 25 using content::BrowserThread; | 32 using content::BrowserThread; |
| 26 | 33 |
| 27 namespace drive { | 34 namespace drive { |
| 28 namespace { | 35 namespace { |
| 29 | 36 |
| 30 struct MimeTypeReplacement { | 37 struct MimeTypeReplacement { |
| 31 const char* original_type; | 38 const char* original_type; |
| 32 const char* new_type; | 39 const char* new_type; |
| 33 }; | 40 }; |
| 34 | 41 |
| 35 const MimeTypeReplacement kMimeTypeReplacements[] = { | 42 const MimeTypeReplacement kMimeTypeReplacements[] = { |
| 36 {"message/rfc822", "multipart/related"} // Fixes MHTML | 43 {"message/rfc822", "multipart/related"} // Fixes MHTML |
| 37 }; | 44 }; |
| 38 | 45 |
| 39 std::string FixupMimeType(const std::string& type) { | 46 // Check if the |url| points a valid location or not. |
| 40 for (size_t i = 0; i < arraysize(kMimeTypeReplacements); i++) { | 47 bool IsValidURL(const storage::FileSystemURL& url) { |
| 41 if (type == kMimeTypeReplacements[i].original_type) | 48 switch (url.type()) { |
| 42 return kMimeTypeReplacements[i].new_type; | 49 case storage::kFileSystemTypeDrive: { |
| 50 const base::FilePath my_drive_path = util::GetDriveMyDriveRootPath(); | |
| 51 const base::FilePath drive_other_path = | |
| 52 util::GetDriveGrandRootPath().Append(util::kDriveOtherDirName); | |
| 53 const base::FilePath url_drive_path = | |
| 54 util::ExtractDrivePathFromFileSystemUrl(url); | |
| 55 return my_drive_path == url_drive_path || | |
| 56 my_drive_path.IsParent(url_drive_path) || | |
| 57 drive_other_path.IsParent(url_drive_path); | |
| 58 } | |
| 59 default: | |
| 60 return false; | |
| 43 } | 61 } |
| 44 return type; | |
| 45 } | 62 } |
| 46 | 63 |
| 64 // Helper for obtaining FileSystemContext, FileSystemURL, and mime type on the | |
| 65 // UI thread. | |
| 66 class URLHelper { | |
| 67 public: | |
| 68 // The scoped pointer to control lifetime of the instance itself. The pointer | |
| 69 // is passed to callback functions and binds the lifetime of the instance to | |
| 70 // the callback's lifetime. | |
| 71 typedef scoped_ptr<URLHelper> Lifetime; | |
| 72 | |
| 73 URLHelper(void* profile_id, | |
| 74 const GURL& url, | |
| 75 const DriveURLRequestJob::HelperCallback& callback) | |
| 76 : profile_id_(profile_id), url_(url), callback_(callback) { | |
| 77 DCHECK_CURRENTLY_ON(BrowserThread::IO); | |
| 78 Lifetime lifetime(this); | |
| 79 BrowserThread::PostTask(BrowserThread::UI, | |
| 80 FROM_HERE, | |
| 81 base::Bind(&URLHelper::RunOnUIThread, | |
| 82 base::Unretained(this), | |
| 83 base::Passed(&lifetime))); | |
| 84 } | |
| 85 | |
| 86 private: | |
| 87 void RunOnUIThread(Lifetime lifetime) { | |
| 88 DCHECK_CURRENTLY_ON(BrowserThread::UI); | |
| 89 Profile* const profile = reinterpret_cast<Profile*>(profile_id_); | |
| 90 if (!g_browser_process->profile_manager()->IsValidProfile(profile)) { | |
| 91 ReplyResult(net::ERR_FAILED); | |
| 92 return; | |
| 93 } | |
| 94 content::StoragePartition* const storage = | |
| 95 content::BrowserContext::GetStoragePartitionForSite(profile, url_); | |
| 96 DCHECK(storage); | |
| 97 | |
| 98 scoped_refptr<storage::FileSystemContext> context = | |
| 99 storage->GetFileSystemContext(); | |
| 100 DCHECK(context.get()); | |
| 101 | |
| 102 // Obtain the absolute path in the file system. | |
| 103 base::FilePath path = drive::util::GetDriveMountPointPath(profile); | |
| 104 drive::util::GetDriveGrandRootPath().AppendRelativePath( | |
| 105 util::DriveURLToFilePath(url_), &path); | |
| 106 | |
| 107 storage::ExternalFileSystemBackend* const backend = | |
| 108 context->external_backend(); | |
| 109 DCHECK(backend); | |
| 110 | |
| 111 // Obtain the virtual path. | |
| 112 base::FilePath virtual_path; | |
| 113 if (!backend->GetVirtualPath(path, &virtual_path)) { | |
| 114 ReplyResult(net::ERR_FILE_NOT_FOUND); | |
| 115 return; | |
| 116 } | |
| 117 | |
| 118 // Obtain the file system URL. | |
| 119 // TODO(hirono): After removing MHTML support, stop to use the special | |
| 120 // drive: scheme and use filesystem: URL directly. crbug.com/415455 | |
| 121 file_system_url_ = context->CreateCrackedFileSystemURL( | |
| 122 GURL(std::string(chrome::kDriveScheme) + ":"), | |
| 123 storage::kFileSystemTypeExternal, | |
| 124 virtual_path); | |
| 125 if (!IsValidURL(file_system_url_)) { | |
| 126 ReplyResult(net::ERR_INVALID_URL); | |
| 127 return; | |
| 128 } | |
| 129 | |
| 130 file_system_context_ = context; | |
| 131 | |
| 132 extensions::app_file_handler_util::GetMimeTypeForLocalPath( | |
| 133 profile, | |
| 134 file_system_url_.path(), | |
| 135 base::Bind(&URLHelper::OnGotMimeTypeOnUIThread, | |
| 136 base::Unretained(this), | |
| 137 base::Passed(&lifetime))); | |
| 138 } | |
| 139 | |
| 140 void OnGotMimeTypeOnUIThread(Lifetime lifetime, | |
| 141 const std::string& mime_type) { | |
| 142 DCHECK_CURRENTLY_ON(BrowserThread::UI); | |
| 143 mime_type_ = mime_type; | |
| 144 for (size_t i = 0; i < arraysize(kMimeTypeReplacements); i++) { | |
|
mtomasz
2014/09/19 05:30:53
It seems that this entire mime replacement logic i
hirono
2014/09/19 06:26:36
Done.
| |
| 145 if (mime_type_ == kMimeTypeReplacements[i].original_type) { | |
| 146 mime_type_ = kMimeTypeReplacements[i].new_type; | |
| 147 break; | |
| 148 } | |
| 149 } | |
| 150 ReplyResult(net::OK); | |
| 151 } | |
| 152 | |
| 153 void ReplyResult(net::Error error) { | |
| 154 DCHECK_CURRENTLY_ON(BrowserThread::UI); | |
| 155 | |
| 156 BrowserThread::PostTask(BrowserThread::IO, | |
| 157 FROM_HERE, | |
| 158 base::Bind(callback_, | |
| 159 error, | |
| 160 file_system_context_, | |
| 161 file_system_url_, | |
| 162 mime_type_)); | |
| 163 } | |
| 164 | |
| 165 void* const profile_id_; | |
| 166 const GURL url_; | |
| 167 const DriveURLRequestJob::HelperCallback callback_; | |
| 168 scoped_refptr<storage::FileSystemContext> file_system_context_; | |
| 169 storage::FileSystemURL file_system_url_; | |
| 170 std::string mime_type_; | |
| 171 | |
| 172 DISALLOW_COPY_AND_ASSIGN(URLHelper); | |
| 173 }; | |
| 174 | |
| 47 } // namespace | 175 } // namespace |
| 48 | 176 |
| 49 DriveURLRequestJob::DriveURLRequestJob( | 177 DriveURLRequestJob::DriveURLRequestJob(void* profile_id, |
| 50 const FileSystemGetter& file_system_getter, | 178 net::URLRequest* request, |
| 51 base::SequencedTaskRunner* file_task_runner, | 179 net::NetworkDelegate* network_delegate) |
| 52 net::URLRequest* request, | |
| 53 net::NetworkDelegate* network_delegate) | |
| 54 : net::URLRequestJob(request, network_delegate), | 180 : net::URLRequestJob(request, network_delegate), |
| 55 file_system_getter_(file_system_getter), | 181 profile_id_(profile_id), |
| 56 file_task_runner_(file_task_runner), | 182 remaining_bytes_(0), |
| 57 weak_ptr_factory_(this) { | 183 weak_ptr_factory_(this) { |
| 58 } | 184 } |
| 59 | 185 |
| 60 void DriveURLRequestJob::SetExtraRequestHeaders( | 186 void DriveURLRequestJob::SetExtraRequestHeaders( |
| 61 const net::HttpRequestHeaders& headers) { | 187 const net::HttpRequestHeaders& headers) { |
| 62 std::string range_header; | 188 std::string range_header; |
| 63 if (headers.GetHeader(net::HttpRequestHeaders::kRange, &range_header)) { | 189 if (headers.GetHeader(net::HttpRequestHeaders::kRange, &range_header)) { |
| 64 // Note: We only support single range requests. | 190 // Note: We only support single range requests. |
| 65 std::vector<net::HttpByteRange> ranges; | 191 std::vector<net::HttpByteRange> ranges; |
| 66 if (net::HttpUtil::ParseRangeHeader(range_header, &ranges) && | 192 if (net::HttpUtil::ParseRangeHeader(range_header, &ranges) && |
| 67 ranges.size() == 1) { | 193 ranges.size() == 1) { |
| 68 byte_range_ = ranges[0]; | 194 byte_range_ = ranges[0]; |
| 69 } else { | 195 } else { |
| 70 // Failed to parse Range: header, so notify the error. | 196 // Failed to parse Range: header, so notify the error. |
| 71 NotifyDone( | 197 NotifyDone( |
| 72 net::URLRequestStatus(net::URLRequestStatus::FAILED, | 198 net::URLRequestStatus(net::URLRequestStatus::FAILED, |
| 73 net::ERR_REQUEST_RANGE_NOT_SATISFIABLE)); | 199 net::ERR_REQUEST_RANGE_NOT_SATISFIABLE)); |
| 74 } | 200 } |
| 75 } | 201 } |
| 76 } | 202 } |
| 77 | 203 |
| 78 void DriveURLRequestJob::Start() { | 204 void DriveURLRequestJob::Start() { |
| 79 DVLOG(1) << "Starting request"; | 205 DVLOG(1) << "Starting request"; |
| 80 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 206 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 81 DCHECK(!stream_reader_); | 207 DCHECK(!stream_reader_); |
| 82 | 208 |
| 83 // We only support GET request. | 209 // We only support GET request. |
| 84 if (request()->method() != "GET") { | 210 if (request()->method() != "GET") { |
| 85 LOG(WARNING) << "Failed to start request: " | 211 LOG(WARNING) << "Failed to start request: " |
| 86 << request()->method() << " method is not supported"; | 212 << request()->method() << " method is not supported"; |
| 87 NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED, | 213 NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED, |
| 88 net::ERR_METHOD_NOT_SUPPORTED)); | 214 net::ERR_METHOD_NOT_SUPPORTED)); |
| 89 return; | 215 return; |
| 90 } | 216 } |
| 91 | 217 |
| 92 base::FilePath drive_file_path(util::DriveURLToFilePath(request_->url())); | 218 // Check if the scheme is correct. |
| 93 if (drive_file_path.empty()) { | 219 if (!request()->url().SchemeIs(chrome::kDriveScheme)) { |
| 94 // Not a valid url. | |
| 95 NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED, | 220 NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED, |
| 96 net::ERR_INVALID_URL)); | 221 net::ERR_INVALID_URL)); |
| 97 return; | 222 return; |
| 98 } | 223 } |
| 99 | 224 |
| 100 // Initialize the stream reader. | 225 // Owned by itself. |
| 101 stream_reader_.reset( | 226 new URLHelper(profile_id_, |
| 102 new DriveFileStreamReader(file_system_getter_, file_task_runner_.get())); | 227 request()->url(), |
| 103 stream_reader_->Initialize( | 228 base::Bind(&DriveURLRequestJob::OnHelperResultObtained, |
| 104 drive_file_path, | 229 weak_ptr_factory_.GetWeakPtr())); |
| 105 byte_range_, | 230 } |
| 106 base::Bind(&DriveURLRequestJob::OnDriveFileStreamReaderInitialized, | 231 |
| 232 void DriveURLRequestJob::OnHelperResultObtained( | |
| 233 net::Error error, | |
| 234 const scoped_refptr<storage::FileSystemContext>& file_system_context, | |
| 235 const storage::FileSystemURL& file_system_url, | |
| 236 const std::string& mime_type) { | |
| 237 DCHECK_CURRENTLY_ON(BrowserThread::IO); | |
| 238 | |
| 239 if (error != net::OK) { | |
| 240 NotifyStartError( | |
| 241 net::URLRequestStatus(net::URLRequestStatus::FAILED, error)); | |
| 242 return; | |
| 243 } | |
| 244 | |
| 245 DCHECK(file_system_context.get()); | |
| 246 file_system_context_ = file_system_context; | |
| 247 file_system_url_ = file_system_url; | |
| 248 mime_type_ = mime_type; | |
| 249 | |
| 250 // Check if the entry has a redirect URL. | |
| 251 file_system_context_->external_backend()->GetRedirectURLForContents( | |
| 252 file_system_url_, | |
| 253 base::Bind(&DriveURLRequestJob::OnRedirectURLObtained, | |
| 107 weak_ptr_factory_.GetWeakPtr())); | 254 weak_ptr_factory_.GetWeakPtr())); |
| 108 } | 255 } |
| 109 | 256 |
| 257 void DriveURLRequestJob::OnRedirectURLObtained(const GURL& redirect_url) { | |
| 258 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | |
| 259 redirect_url_ = redirect_url; | |
| 260 if (!redirect_url_.is_empty()) { | |
| 261 NotifyHeadersComplete(); | |
| 262 return; | |
| 263 } | |
| 264 | |
| 265 // Obtain file system context. | |
| 266 file_system_context_->operation_runner()->GetMetadata( | |
| 267 file_system_url_, | |
| 268 base::Bind(&DriveURLRequestJob::OnFileInfoObtained, | |
| 269 weak_ptr_factory_.GetWeakPtr())); | |
| 270 } | |
| 271 | |
| 272 void DriveURLRequestJob::OnFileInfoObtained(base::File::Error result, | |
| 273 const base::File::Info& file_info) { | |
| 274 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | |
| 275 | |
| 276 if (result == base::File::FILE_ERROR_NOT_FOUND) { | |
| 277 NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED, | |
| 278 net::ERR_FILE_NOT_FOUND)); | |
| 279 return; | |
| 280 } | |
| 281 | |
| 282 if (result != base::File::FILE_OK || file_info.is_directory) { | |
| 283 NotifyStartError( | |
| 284 net::URLRequestStatus(net::URLRequestStatus::FAILED, net::ERR_FAILED)); | |
| 285 return; | |
| 286 } | |
| 287 | |
| 288 // Compute content size. | |
| 289 int64 offset = 0; | |
| 290 int64 size = storage::kMaximumLength; | |
| 291 if (byte_range_.ComputeBounds(file_info.size)) { | |
| 292 offset = byte_range_.first_byte_position(); | |
| 293 size = byte_range_.last_byte_position() + 1 - | |
| 294 byte_range_.first_byte_position(); | |
| 295 set_expected_content_size(size); | |
| 296 } | |
| 297 remaining_bytes_ = size; | |
| 298 | |
| 299 // Create file stream reader. | |
| 300 stream_reader_ = file_system_context_->CreateFileStreamReader( | |
| 301 file_system_url_, offset, size, base::Time()); | |
| 302 if (!stream_reader_) { | |
| 303 NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED, | |
| 304 net::ERR_FILE_NOT_FOUND)); | |
| 305 return; | |
| 306 } | |
| 307 | |
| 308 NotifyHeadersComplete(); | |
| 309 } | |
| 310 | |
| 110 void DriveURLRequestJob::Kill() { | 311 void DriveURLRequestJob::Kill() { |
| 111 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 312 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 112 | 313 |
| 113 stream_reader_.reset(); | 314 stream_reader_.reset(); |
| 315 file_system_context_ = NULL; | |
| 114 net::URLRequestJob::Kill(); | 316 net::URLRequestJob::Kill(); |
| 115 weak_ptr_factory_.InvalidateWeakPtrs(); | 317 weak_ptr_factory_.InvalidateWeakPtrs(); |
| 116 } | 318 } |
| 117 | 319 |
| 118 bool DriveURLRequestJob::GetMimeType(std::string* mime_type) const { | 320 bool DriveURLRequestJob::GetMimeType(std::string* mime_type) const { |
| 119 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 321 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 120 | 322 mime_type->assign(mime_type_); |
| 121 if (!entry_) { | |
| 122 return false; | |
| 123 } | |
| 124 | |
| 125 mime_type->assign( | |
| 126 FixupMimeType(entry_->file_specific_info().content_mime_type())); | |
| 127 return !mime_type->empty(); | 323 return !mime_type->empty(); |
| 128 } | 324 } |
| 129 | 325 |
| 130 bool DriveURLRequestJob::IsRedirectResponse( | 326 bool DriveURLRequestJob::IsRedirectResponse( |
| 131 GURL* location, int* http_status_code) { | 327 GURL* location, int* http_status_code) { |
| 132 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 328 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 133 | 329 if (redirect_url_.is_empty()) |
| 134 if (!entry_ || !entry_->file_specific_info().is_hosted_document()) { | |
| 135 return false; | 330 return false; |
| 136 } | |
| 137 | 331 |
| 138 // Redirect a hosted document. | 332 // Redirect a hosted document. |
| 139 *location = GURL(entry_->file_specific_info().alternate_url()); | 333 *location = redirect_url_; |
| 140 const int kHttpFound = 302; | 334 const int kHttpFound = 302; |
| 141 *http_status_code = kHttpFound; | 335 *http_status_code = kHttpFound; |
| 142 return true; | 336 return true; |
| 143 } | 337 } |
| 144 | 338 |
| 145 bool DriveURLRequestJob::ReadRawData( | 339 bool DriveURLRequestJob::ReadRawData( |
| 146 net::IOBuffer* buf, int buf_size, int* bytes_read) { | 340 net::IOBuffer* buf, int buf_size, int* bytes_read) { |
| 147 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 341 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 148 DCHECK(stream_reader_ && stream_reader_->IsInitialized()); | 342 DCHECK(stream_reader_); |
| 149 | 343 |
| 150 int result = stream_reader_->Read( | 344 if (remaining_bytes_ == 0) { |
| 151 buf, buf_size, | 345 *bytes_read = 0; |
| 346 return true; | |
| 347 } | |
| 348 | |
| 349 const int result = stream_reader_->Read( | |
| 350 buf, | |
| 351 std::min(static_cast<int64>(buf_size), remaining_bytes_), | |
| 152 base::Bind(&DriveURLRequestJob::OnReadCompleted, | 352 base::Bind(&DriveURLRequestJob::OnReadCompleted, |
| 153 weak_ptr_factory_.GetWeakPtr())); | 353 weak_ptr_factory_.GetWeakPtr())); |
| 154 | 354 |
| 155 if (result == net::ERR_IO_PENDING) { | 355 if (result == net::ERR_IO_PENDING) { |
| 156 // The data is not yet available. | 356 // The data is not yet available. |
| 157 SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING, 0)); | 357 SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING, 0)); |
| 158 return false; | 358 return false; |
| 159 } | 359 } |
| 160 if (result < 0) { | 360 if (result < 0) { |
| 161 // An error occurs. | 361 // An error occurs. |
| 162 NotifyDone(net::URLRequestStatus(net::URLRequestStatus::FAILED, result)); | 362 NotifyDone(net::URLRequestStatus(net::URLRequestStatus::FAILED, result)); |
| 163 return false; | 363 return false; |
| 164 } | 364 } |
| 165 | 365 |
| 166 // Reading has been finished immediately. | 366 // Reading has been finished immediately. |
| 167 *bytes_read = result; | 367 *bytes_read = result; |
| 368 remaining_bytes_ -= result; | |
| 168 return true; | 369 return true; |
| 169 } | 370 } |
| 170 | 371 |
| 171 DriveURLRequestJob::~DriveURLRequestJob() { | 372 DriveURLRequestJob::~DriveURLRequestJob() { |
| 172 } | 373 } |
| 173 | 374 |
| 174 void DriveURLRequestJob::OnDriveFileStreamReaderInitialized( | |
| 175 int error, scoped_ptr<ResourceEntry> entry) { | |
| 176 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | |
| 177 DCHECK(stream_reader_); | |
| 178 | |
| 179 if (error != FILE_ERROR_OK) { | |
| 180 NotifyStartError( | |
| 181 net::URLRequestStatus(net::URLRequestStatus::FAILED, error)); | |
| 182 return; | |
| 183 } | |
| 184 | |
| 185 DCHECK(entry && entry->has_file_specific_info()); | |
| 186 entry_ = entry.Pass(); | |
| 187 | |
| 188 if (!entry_->file_specific_info().is_hosted_document()) { | |
| 189 // We don't need to set content size for hosted documents, | |
| 190 // because it will be redirected. | |
| 191 set_expected_content_size(entry_->file_info().size()); | |
| 192 } | |
| 193 | |
| 194 NotifyHeadersComplete(); | |
| 195 } | |
| 196 | |
| 197 void DriveURLRequestJob::OnReadCompleted(int read_result) { | 375 void DriveURLRequestJob::OnReadCompleted(int read_result) { |
| 198 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 376 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 199 | 377 |
| 200 if (read_result < 0) { | 378 if (read_result < 0) { |
| 201 DCHECK_NE(read_result, net::ERR_IO_PENDING); | 379 DCHECK_NE(read_result, net::ERR_IO_PENDING); |
| 202 NotifyDone(net::URLRequestStatus(net::URLRequestStatus::FAILED, | 380 NotifyDone(net::URLRequestStatus(net::URLRequestStatus::FAILED, |
| 203 read_result)); | 381 read_result)); |
| 204 } | 382 } |
| 205 | 383 |
| 384 remaining_bytes_ -= read_result; | |
| 206 SetStatus(net::URLRequestStatus()); // Clear the IO_PENDING status. | 385 SetStatus(net::URLRequestStatus()); // Clear the IO_PENDING status. |
| 207 NotifyReadComplete(read_result); | 386 NotifyReadComplete(read_result); |
| 208 } | 387 } |
| 209 | 388 |
| 210 } // namespace drive | 389 } // namespace drive |
| OLD | NEW |