Add CreateFileSystemOperation() method to FileSystemContext

webkit/fileapi/file_system_dir_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_dir_url_request_job.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util_proxy.h"
 #include "base/message_loop.h"
 #include "base/platform_file.h"
 #include "base/sys_string_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request.h"
 #include "webkit/fileapi/file_system_callback_dispatcher.h"
+#include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_util.h"
 
 using net::URLRequest;
 using net::URLRequestJob;
 using net::URLRequestStatus;
 
 namespace fileapi {
 
 static FilePath GetRelativePath(const GURL& url) {
@@ skipping 98 matching lines @@
   *mime_type = "text/html";
   return true;
 }
 
 bool FileSystemDirURLRequestJob::GetCharset(std::string* charset) {
   *charset = "utf-8";
   return true;
 }
 
 void FileSystemDirURLRequestJob::StartAsync() {
-  if (request_)
-    GetNewOperation()->ReadDirectory(request_->url());
+  if (!request_)
+    return;
+  FileSystemOperationInterface* operation = GetNewOperation(request_->url());
+  if (!operation) {
+    NotifyDone(URLRequestStatus(URLRequestStatus::FAILED,
+                                net::ERR_INVALID_URL));
+    return;
+  }
+  operation->ReadDirectory(request_->url());
 }
 
 void FileSystemDirURLRequestJob::DidReadDirectory(
     const std::vector<base::FileUtilProxy::Entry>& entries,
     bool has_more) {
   if (!request_)
     return;
 
   if (data_.empty()) {
     FilePath relative_path = GetRelativePath(request_->url());
@@ skipping 13 matching lines @@
 #elif defined(OS_POSIX)
     const string16& name =
         WideToUTF16(base::SysNativeMBToWide(it->name));
 #endif
     data_.append(net::GetDirectoryListingEntry(
         name, std::string(), it->is_directory, it->size,
         it->last_modified_time));
   }
 
   if (has_more) {
-    GetNewOperation()->ReadDirectory(request_->url());
+    GetNewOperation(request_->url())->ReadDirectory(request_->url());
   } else {
     set_expected_content_size(data_.size());
     NotifyHeadersComplete();
   }
 }
 
-FileSystemOperation* FileSystemDirURLRequestJob::GetNewOperation() {
-  return new FileSystemOperation(CallbackDispatcher::Create(this),
-                                 file_thread_proxy_,
-                                 file_system_context_);
+FileSystemOperationInterface*
+FileSystemDirURLRequestJob::GetNewOperation(const GURL& url) {
+  return file_system_context_->CreateFileSystemOperation(
+      url,
+      CallbackDispatcher::Create(this),
+      file_thread_proxy_);
 }
 
 }  // namespace fileapi