Cleanup FileSystemOperation for preparing for adding FSO-factory method

content/browser/file_system/file_system_dispatcher_host.cc

Index: content/browser/file_system/file_system_dispatcher_host.cc
diff --git a/content/browser/file_system/file_system_dispatcher_host.cc b/content/browser/file_system/file_system_dispatcher_host.cc
index 7034be2806940199b9bfae98af950f3dfb56f980..3f75e343ad18d66bf1f2fca194ff0c0d650b9528 100644
--- a/content/browser/file_system/file_system_dispatcher_host.cc
+++ b/content/browser/file_system/file_system_dispatcher_host.cc
@@ -30,7 +30,6 @@ using content::UserMetricsAction;
 using fileapi::FileSystemCallbackDispatcher;
 using fileapi::FileSystemFileUtil;
 using fileapi::FileSystemOperation;
-using fileapi::FileSystemOperationContext;
 
 class BrowserFileSystemCallbackDispatcher
     : public FileSystemCallbackDispatcher {
@@ -171,7 +170,9 @@ void FileSystemDispatcherHost::OnOpen(
   } else if (type == fileapi::kFileSystemTypePersistent) {
     content::RecordAction(UserMetricsAction("OpenFileSystemPersistent"));
   }
-  GetNewOperation(request_id)->OpenFileSystem(origin_url, type, create);
+  context_->OpenFileSystem(origin_url, type, create,
+                           new BrowserFileSystemCallbackDispatcher(
+                               this, request_id));
 }
 
 void FileSystemDispatcherHost::OnMove(
@@ -254,7 +255,7 @@ void FileSystemDispatcherHost::OnCancel(
   if (write) {
     // The cancel will eventually send both the write failure and the cancel
     // success.
-    write->Cancel(GetNewOperation(request_id));
+    write->Cancel(new BrowserFileSystemCallbackDispatcher(this, request_id));
   } else {
     // The write already finished; report that we failed to stop it.
     Send(new FileSystemMsg_DidFail(
@@ -318,6 +319,5 @@ FileSystemOperation* FileSystemDispatcherHost::GetNewOperation(
 }
 
 void FileSystemDispatcherHost::UnregisterOperation(int request_id) {
-  DCHECK(operations_.Lookup(request_id));
   operations_.Remove(request_id);
 }