Cleanup FileSystemOperation for preparing for adding FSO-factory method

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 37 matching lines @@
   std::string cache_control(net::HttpRequestHeaders::kCacheControl);
   cache_control.append(": no-cache");
   headers->AddHeader(cache_control);
 
   return headers;
 }
 
 class FileSystemURLRequestJob::CallbackDispatcher
     : public FileSystemCallbackDispatcher {
  public:
-  explicit CallbackDispatcher(FileSystemURLRequestJob* job)
-      : job_(job) {
-    DCHECK(job_);
+  // An instance of this class must be created by Create()
+  // (so that we do not leak ownerships).
+  static scoped_ptr<FileSystemCallbackDispatcher> Create(
+      FileSystemURLRequestJob* job) {
+    return scoped_ptr<FileSystemCallbackDispatcher>(
+        new CallbackDispatcher(job));
   }
 
   // fileapi::FileSystemCallbackDispatcher overrides.
   virtual void DidSucceed() OVERRIDE {
     NOTREACHED();
   }
 
   virtual void DidReadMetadata(const base::PlatformFileInfo& file_info,
                                const FilePath& platform_path) OVERRIDE {
     job_->DidGetMetadata(file_info, platform_path);
@@ skipping 15 matching lines @@
   }
 
   virtual void DidFail(base::PlatformFileError error_code) OVERRIDE {
     int rv = net::ERR_FILE_NOT_FOUND;
     if (error_code == base::PLATFORM_FILE_ERROR_INVALID_URL)
       rv = net::ERR_INVALID_URL;
     job_->NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, rv));
   }
 
  private:
+  explicit CallbackDispatcher(FileSystemURLRequestJob* job) : job_(job) {
+    DCHECK(job_);
+  }
+
   // TODO(adamk): Get rid of the need for refcounting here by
   // allowing FileSystemOperations to be cancelled.
   scoped_refptr<FileSystemURLRequestJob> job_;
   DISALLOW_COPY_AND_ASSIGN(CallbackDispatcher);
 };
 
 FileSystemURLRequestJob::FileSystemURLRequestJob(
     URLRequest* request, FileSystemContext* file_system_context,
     scoped_refptr<base::MessageLoopProxy> file_thread_proxy)
     : URLRequestJob(request),
@@ skipping 100 matching lines @@
 }
 
 int FileSystemURLRequestJob::GetResponseCode() const {
   if (response_info_.get())
     return 200;
   return URLRequestJob::GetResponseCode();
 }
 
 void FileSystemURLRequestJob::StartAsync() {
   if (request_) {
-    (new FileSystemOperation(new CallbackDispatcher(this),
+    (new FileSystemOperation(CallbackDispatcher::Create(this),
                              file_thread_proxy_,
                              file_system_context_)
                             )->GetMetadata(request_->url());
   }
 }
 
 void FileSystemURLRequestJob::DidGetMetadata(
     const base::PlatformFileInfo& file_info,
     const FilePath& platform_path) {
   // We may have been orphaned...
@@ skipping 79 matching lines @@
   }
 
   return false;
 }
 
 void FileSystemURLRequestJob::NotifyFailed(int rv) {
   NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, rv));
 }
 
 }  // namespace fileapi