Make FileSystemOperation's lifetime more explicit.

chrome/browser/file_system/file_system_dispatcher_host.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_HOST_H_
 #define CHROME_BROWSER_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_HOST_H_
 
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 61 matching lines @@
                const FilePath& path,
                const GURL& blob_url,
                int64 offset);
   void OnTruncate(int request_id, const FilePath& path, int64 length);
   void OnTouchFile(int request_id,
                    const FilePath& path,
                    const base::Time& last_access_time,
                    const base::Time& last_modified_time);
   void OnCancel(int request_id, int request_to_cancel);
   void Send(IPC::Message* message);
-  void RemoveCompletedOperation(int request_id);
+  void UnregisterOperation(int request_id);
 
  private:
   // Creates a new SandboxedFileSystemOperation.
   fileapi::SandboxedFileSystemOperation* GetNewOperation(int request_id);
 
   // The sender to be used for sending out IPC messages.
   IPC::Message::Sender* message_sender_;
 
   // The handle of this process.
   base::ProcessHandle process_handle_;
 
   bool shutdown_;
 
   scoped_refptr<BrowserFileSystemContext> context_;
 
   // Used to look up permissions.
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
 
   // Keeps ongoing file system operations.
-  typedef IDMap<fileapi::SandboxedFileSystemOperation, IDMapOwnPointer>
-      OperationsMap;
+  typedef IDMap<fileapi::SandboxedFileSystemOperation> OperationsMap;
   OperationsMap operations_;
 
   // This holds the URLRequestContextGetter until Init() can be called from the
   // IO thread, which will extract the URLRequestContext from it.
   scoped_refptr<URLRequestContextGetter> request_context_getter_;
   scoped_refptr<URLRequestContext> request_context_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemDispatcherHost);
 };
 
 #endif  // CHROME_BROWSER_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_HOST_H_