Revert 214599 "Revert 214160 "Implement Worker-MainThread bridge..."

trunk/src/content/child/fileapi/file_system_dispatcher.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 "content/child/fileapi/file_system_dispatcher.h"
 
 #include "base/callback.h"
 #include "base/file_util.h"
+#include "base/message_loop/message_loop_proxy.h"
 #include "base/process/process.h"
 #include "content/child/child_thread.h"
 #include "content/common/fileapi/file_system_messages.h"
 
 namespace content {
 
 class FileSystemDispatcher::CallbackDispatcher {
  public:
   typedef CallbackDispatcher self;
   typedef FileSystemDispatcher::StatusCallback StatusCallback;
@@ skipping 62 matching lines @@
     error_callback_.Run(error_code);
   }
 
   void DidReadMetadata(
       const base::PlatformFileInfo& file_info) {
     metadata_callback_.Run(file_info);
   }
 
   void DidCreateSnapshotFile(
       const base::PlatformFileInfo& file_info,
-      const base::FilePath& platform_path) {
-    snapshot_callback_.Run(file_info, platform_path);
+      const base::FilePath& platform_path,
+      int request_id) {
+    snapshot_callback_.Run(file_info, platform_path, request_id);
   }
 
   void DidReadDirectory(
       const std::vector<fileapi::DirectoryEntry>& entries,
       bool has_more) {
     directory_callback_.Run(entries, has_more);
   }
 
   void DidOpenFileSystem(const std::string& name,
                          const GURL& root) {
@@ skipping 253 matching lines @@
   DCHECK(dispatcher);
   dispatcher->DidReadMetadata(file_info);
   dispatchers_.Remove(request_id);
 }
 
 void FileSystemDispatcher::OnDidCreateSnapshotFile(
     int request_id, const base::PlatformFileInfo& file_info,
     const base::FilePath& platform_path) {
   CallbackDispatcher* dispatcher = dispatchers_.Lookup(request_id);
   DCHECK(dispatcher);
-  dispatcher->DidCreateSnapshotFile(file_info, platform_path);
+  dispatcher->DidCreateSnapshotFile(file_info, platform_path, request_id);
   dispatchers_.Remove(request_id);
-  ChildThread::current()->Send(
-      new FileSystemHostMsg_DidReceiveSnapshotFile(request_id));
 }
 
 void FileSystemDispatcher::OnDidReadDirectory(
     int request_id,
     const std::vector<fileapi::DirectoryEntry>& entries,
     bool has_more) {
   CallbackDispatcher* dispatcher = dispatchers_.Lookup(request_id);
   DCHECK(dispatcher);
   dispatcher->DidReadDirectory(entries, has_more);
   dispatchers_.Remove(request_id);
@@ skipping 23 matching lines @@
     quota::QuotaLimitType quota_policy) {
   CallbackDispatcher* dispatcher = dispatchers_.Lookup(request_id);
   DCHECK(dispatcher);
   dispatcher->DidOpenFile(IPC::PlatformFileForTransitToPlatformFile(file),
                           file_open_id,
                           quota_policy);
   dispatchers_.Remove(request_id);
 }
 
 }  // namespace content