Move storage-related files from webkit/ to new top-level directory storage/

storage/browser/blob/blob_storage_context.h

Index: storage/browser/blob/blob_storage_context.h
diff --git a/webkit/browser/blob/blob_storage_context.h b/storage/browser/blob/blob_storage_context.h
similarity index 82%
rename from webkit/browser/blob/blob_storage_context.h
rename to storage/browser/blob/blob_storage_context.h
index a753c59c3bb9450e4ff9e71fc726a62b65f249c1..88d3d24c618bfeb1f8725d6c8a9fa66708df76a1 100644
--- a/webkit/browser/blob/blob_storage_context.h
+++ b/storage/browser/blob/blob_storage_context.h
@@ -11,9 +11,9 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "webkit/browser/blob/blob_data_handle.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
-#include "webkit/common/blob/blob_data.h"
+#include "storage/browser/blob/blob_data_handle.h"
+#include "storage/common/storage_export.h"
+#include "storage/common/blob/blob_data.h"
 
 class GURL;
 
@@ -26,7 +26,7 @@ namespace content {
 class BlobStorageHost;
 }
 
-namespace webkit_blob {
+namespace storage {
 
 class BlobDataHandle;
 
@@ -34,7 +34,7 @@ class BlobDataHandle;
 // and maintains a mapping from blob uuid to the data. The class is single
 // threaded and should only be used on the IO thread.
 // In chromium, there is one instance per profile.
-class WEBKIT_STORAGE_BROWSER_EXPORT BlobStorageContext
+class STORAGE_EXPORT BlobStorageContext
     : public base::SupportsWeakPtr<BlobStorageContext> {
  public:
   BlobStorageContext();
@@ -71,8 +71,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT BlobStorageContext
     ~BlobMapEntry();
   };
 
-  typedef std::map<std::string, BlobMapEntry>
-      BlobMap;
+  typedef std::map<std::string, BlobMapEntry> BlobMap;
   typedef std::map<GURL, std::string> BlobURLMap;
 
   void StartBuildingBlob(const std::string& uuid);
@@ -88,15 +87,18 @@ class WEBKIT_STORAGE_BROWSER_EXPORT BlobStorageContext
                           uint64 offset,
                           uint64 length);
   bool AppendBytesItem(BlobData* target_blob_data,
-                       const char* data, int64 length);
+                       const char* data,
+                       int64 length);
   void AppendFileItem(BlobData* target_blob_data,
                       const base::FilePath& file_path,
-                      uint64 offset, uint64 length,
+                      uint64 offset,
+                      uint64 length,
                       const base::Time& expected_modification_time);
-  void AppendFileSystemFileItem(
-      BlobData* target_blob_data,
-      const GURL& url, uint64 offset, uint64 length,
-      const base::Time& expected_modification_time);
+  void AppendFileSystemFileItem(BlobData* target_blob_data,
+                                const GURL& url,
+                                uint64 offset,
+                                uint64 length,
+                                const base::Time& expected_modification_time);
 
   bool IsInUse(const std::string& uuid);
   bool IsBeingBuilt(const std::string& uuid);
@@ -113,6 +115,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT BlobStorageContext
   DISALLOW_COPY_AND_ASSIGN(BlobStorageContext);
 };
 
-}  // namespace webkit_blob
+}  // namespace storage
 
 #endif  // WEBKIT_BROWSER_BLOB_BLOB_STORAGE_CONTEXT_H_