webkit: Merge blob and fileapi into one build target 'storage'

webkit/blob/blob_data.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 WEBKIT_BLOB_BLOB_DATA_H_
 #define WEBKIT_BLOB_BLOB_DATA_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/blob/blob_export.h"
+#include "webkit/base/data_element.h"
 #include "webkit/blob/shareable_file_reference.h"
-#include "webkit/base/data_element.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace webkit_blob {
 
-class BLOB_EXPORT BlobData : public base::RefCounted<BlobData> {
+class WEBKIT_STORAGE_EXPORT BlobData : public base::RefCounted<BlobData> {
  public:
   typedef webkit_base::DataElement Item;
 
   BlobData();
 
   void AppendData(const std::string& data) {
     AppendData(data.c_str(), data.size());
   }
 
   void AppendData(const char* data, size_t length);
@@ skipping 54 matching lines @@
 }
 
 inline bool operator!=(const BlobData& a, const BlobData& b) {
   return !(a == b);
 }
 #endif  // defined(UNIT_TEST)
 
 }  // namespace webkit_blob
 
 #endif  // WEBKIT_BLOB_BLOB_DATA_H_