Cleanup FileSystemOperation for preparing for adding FSO-factory method

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"
@@ skipping 23 matching lines @@
   FilePath relative_path;
   GURL unused_url;
   FileSystemType unused_type;
   CrackFileSystemURL(url, &unused_url, &unused_type, &relative_path);
   return relative_path;
 }
 
 class FileSystemDirURLRequestJob::CallbackDispatcher
     : public FileSystemCallbackDispatcher {
  public:
-  explicit CallbackDispatcher(FileSystemDirURLRequestJob* job)
-      : job_(job) {
-    DCHECK(job_);
+  // An instance of this class must be created by Create()
+  // (so that we do not leak ownership).
+  static scoped_ptr<FileSystemCallbackDispatcher> Create(
+      FileSystemDirURLRequestJob* 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 {
     NOTREACHED();
@@ 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(FileSystemDirURLRequestJob* job) : job_(job) {
+    DCHECK(job_);
+  }
+
   // TODO(adamk): Get rid of the need for refcounting here by
   // allowing FileSystemOperations to be cancelled.
   scoped_refptr<FileSystemDirURLRequestJob> job_;
   DISALLOW_COPY_AND_ASSIGN(CallbackDispatcher);
 };
 
 FileSystemDirURLRequestJob::FileSystemDirURLRequestJob(
     URLRequest* request, FileSystemContext* file_system_context,
     scoped_refptr<base::MessageLoopProxy> file_thread_proxy)
     : URLRequestJob(request),
@@ skipping 76 matching lines @@
 
   if (has_more) {
     GetNewOperation()->ReadDirectory(request_->url());
   } else {
     set_expected_content_size(data_.size());
     NotifyHeadersComplete();
   }
 }
 
 FileSystemOperation* FileSystemDirURLRequestJob::GetNewOperation() {
-  return new FileSystemOperation(new CallbackDispatcher(this),
+  return new FileSystemOperation(CallbackDispatcher::Create(this),
                                  file_thread_proxy_,
                                  file_system_context_);
 }
 
 }  // namespace fileapi