[Storage] Blob Storage Refactoring pt 1

content/browser/fileapi/fileapi_message_filter.h

 // 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.
 
 #ifndef CONTENT_BROWSER_FILEAPI_FILEAPI_MESSAGE_FILTER_H_
 #define CONTENT_BROWSER_FILEAPI_FILEAPI_MESSAGE_FILTER_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/files/file_util_proxy.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/shared_memory.h"
 #include "content/browser/streams/stream.h"
 #include "content/browser/streams/stream_context.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "storage/browser/fileapi/file_system_context.h"
 #include "storage/browser/fileapi/file_system_operation_runner.h"
-#include "storage/common/blob/blob_data.h"
 #include "storage/common/fileapi/file_system_types.h"
 #include "storage/common/quota/quota_types.h"
 
 class GURL;
 
 namespace base {
 class FilePath;
 class Time;
 }
 
 namespace storage {
 class FileSystemURL;
 class FileSystemOperationRunner;
 struct DirectoryEntry;
 struct FileSystemInfo;
 }
 
 namespace net {
 class URLRequestContext;
 class URLRequestContextGetter;
 }  // namespace net
 
 namespace content {
 class BlobStorageHost;
 }
 
 namespace storage {
 class ShareableFileReference;
+class DataElement;
 }
 
 namespace content {
 class ChildProcessSecurityPolicyImpl;
 class ChromeBlobStorageContext;
 
 // TODO(tyoshino): Factor out code except for IPC gluing from
 // FileAPIMessageFilter into separate classes. See crbug.com/263741.
 class CONTENT_EXPORT FileAPIMessageFilter : public BrowserMessageFilter {
  public:
@@ skipping 61 matching lines @@
   void OnSyncGetPlatformPath(const GURL& path,
                              base::FilePath* platform_path);
   void OnCreateSnapshotFile(int request_id,
                             const GURL& path);
   void OnDidReceiveSnapshotFile(int request_id);
 
   // Handlers for BlobHostMsg_ family messages.
 
   void OnStartBuildingBlob(const std::string& uuid);
   void OnAppendBlobDataItemToBlob(const std::string& uuid,
-                                  const storage::BlobData::Item& item);
+                                  const storage::DataElement& item);
   void OnAppendSharedMemoryToBlob(const std::string& uuid,
                                   base::SharedMemoryHandle handle,
                                   size_t buffer_size);
   void OnFinishBuildingBlob(const std::string& uuid,
                              const std::string& content_type);
   void OnIncrementBlobRefCount(const std::string& uuid);
   void OnDecrementBlobRefCount(const std::string& uuid);
   void OnRegisterPublicBlobURL(const GURL& public_url, const std::string& uuid);
   void OnRevokePublicBlobURL(const GURL& public_url);
 
   // Handlers for StreamHostMsg_ family messages.
   //
   // TODO(tyoshino): Consider renaming BlobData to more generic one as it's now
   // used for Stream.
 
   // Currently |content_type| is ignored.
   //
   // TODO(tyoshino): Set |content_type| to the stream.
   void OnStartBuildingStream(const GURL& url, const std::string& content_type);
   void OnAppendBlobDataItemToStream(const GURL& url,
-                                    const storage::BlobData::Item& item);
+                                    const storage::DataElement& item);
   void OnAppendSharedMemoryToStream(
       const GURL& url, base::SharedMemoryHandle handle, size_t buffer_size);
   void OnFlushStream(const GURL& url);
   void OnFinishBuildingStream(const GURL& url);
   void OnAbortBuildingStream(const GURL& url);
   void OnCloneStream(const GURL& url, const GURL& src_url);
   void OnRemoveStream(const GURL& url);
 
   // Callback functions to be used when each file operation is finished.
   void DidFinish(int request_id, base::File::Error result);
@@ skipping 74 matching lines @@
   // is being sent to the renderer.
   std::map<int, scoped_refptr<storage::ShareableFileReference> >
       in_transit_snapshot_files_;
 
   DISALLOW_COPY_AND_ASSIGN(FileAPIMessageFilter);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FILEAPI_FILEAPI_MESSAGE_FILTER_H_