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

Replace build targets 'blob' and 'fileapi' with newly introduced 'webkit_storage'
Introduce a new directory webkit/storage to host webkit_storage.gypi and webkit_storage_export.h
Replace BLOB_EXPORT and FILEAPI_EXPORT with WEBKIT_STORAGE_EXPORT

BUG=155242
TEST=build
TBR=darin@chromium.org, piman@chromium.org

Review URL: https://chromiumcodereview.appspot.com/11103031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162679 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 36 insertions, 97 deletions

diff --git a/webkit/blob/blob_data.h b/webkit/blob/blob_data.h
index 1afab56..45c75ca 100644
--- a/webkit/blob/blob_data.h
+++ b/webkit/blob/blob_data.h
@@ -12,13 +12,13 @@
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/blob/blob_export.h"
-#include "webkit/blob/shareable_file_reference.h"
 #include "webkit/base/data_element.h"
+#include "webkit/blob/shareable_file_reference.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;
 
diff --git a/webkit/blob/blob_export.h b/webkit/blob/blob_export.h
deleted file mode 100644
index 0ef0edd..0000000
--- a/webkit/blob/blob_export.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2011 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_EXPORT_H_
-#define WEBKIT_BLOB_BLOB_EXPORT_H_
-
-#if defined(COMPONENT_BUILD)
-#if defined(WIN32)
-
-#if defined(BLOB_IMPLEMENTATION)
-#define BLOB_EXPORT __declspec(dllexport)
-#else
-#define BLOB_EXPORT __declspec(dllimport)
-#endif  // defined(BLOB_IMPLEMENTATION)
-
-#else // defined(WIN32)
-#if defined(BLOB_IMPLEMENTATION)
-#define BLOB_EXPORT __attribute__((visibility("default")))
-#else
-#define BLOB_EXPORT
-#endif
-#endif
-
-#else // defined(COMPONENT_BUILD)
-#define BLOB_EXPORT
-#endif
-
-#endif  // WEBKIT_BLOB_BLOB_EXPORT_H_
diff --git a/webkit/blob/blob_storage_controller.h b/webkit/blob/blob_storage_controller.h
index a3189d1..c7e7631 100644
--- a/webkit/blob/blob_storage_controller.h
+++ b/webkit/blob/blob_storage_controller.h
@@ -12,7 +12,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/process.h"
 #include "webkit/blob/blob_data.h"
-#include "webkit/blob/blob_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 class GURL;
 class FilePath;
@@ -24,7 +24,7 @@ class Time;
 namespace webkit_blob {
 
 // This class handles the logistics of blob Storage within the browser process.
-class BLOB_EXPORT BlobStorageController {
+class WEBKIT_STORAGE_EXPORT BlobStorageController {
  public:
   BlobStorageController();
   ~BlobStorageController();
diff --git a/webkit/blob/blob_url_request_job.h b/webkit/blob/blob_url_request_job.h
index 5d95871..c5bd2ed 100644
--- a/webkit/blob/blob_url_request_job.h
+++ b/webkit/blob/blob_url_request_job.h
@@ -11,7 +11,7 @@
 #include "net/http/http_byte_range.h"
 #include "net/url_request/url_request_job.h"
 #include "webkit/blob/blob_data.h"
-#include "webkit/blob/blob_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace base {
 class MessageLoopProxy;
@@ -28,7 +28,7 @@ namespace webkit_blob {
 class LocalFileStreamReader;
 
 // A request job that handles reading blob URLs.
-class BLOB_EXPORT BlobURLRequestJob : public net::URLRequestJob {
+class WEBKIT_STORAGE_EXPORT BlobURLRequestJob : public net::URLRequestJob {
  public:
   BlobURLRequestJob(net::URLRequest* request,
                     net::NetworkDelegate* network_delegate,
diff --git a/webkit/blob/blob_url_request_job_factory.h b/webkit/blob/blob_url_request_job_factory.h
index cf7452a..ddc5742 100644
--- a/webkit/blob/blob_url_request_job_factory.h
+++ b/webkit/blob/blob_url_request_job_factory.h
@@ -8,7 +8,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "net/url_request/url_request_job_factory.h"
-#include "webkit/blob/blob_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace base {
 class MessageLoopProxy;
@@ -23,7 +23,7 @@ namespace webkit_blob {
 class BlobData;
 class BlobStorageController;
 
-class BLOB_EXPORT BlobProtocolHandler
+class WEBKIT_STORAGE_EXPORT BlobProtocolHandler
     : public net::URLRequestJobFactory::ProtocolHandler {
  public:
   // |controller|'s lifetime should exceed the lifetime of the ProtocolHandler.
diff --git a/webkit/blob/file_stream_reader.h b/webkit/blob/file_stream_reader.h
index 95e3571..13f7c4f 100644
--- a/webkit/blob/file_stream_reader.h
+++ b/webkit/blob/file_stream_reader.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "net/base/completion_callback.h"
-#include "webkit/blob/blob_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace net {
 class IOBuffer;
@@ -17,7 +17,7 @@ class IOBuffer;
 namespace webkit_blob {
 
 // A generic interface for reading a file-like object.
-class BLOB_EXPORT FileStreamReader {
+class WEBKIT_STORAGE_EXPORT FileStreamReader {
  public:
   // It is valid to delete the reader at any time.  If the stream is deleted
   // while it has a pending read, its callback will not be called.
diff --git a/webkit/blob/local_file_stream_reader.h b/webkit/blob/local_file_stream_reader.h
index 97e08fb..55b70bf 100644
--- a/webkit/blob/local_file_stream_reader.h
+++ b/webkit/blob/local_file_stream_reader.h
@@ -8,11 +8,11 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
-#include "base/platform_file.h"
 #include "base/memory/weak_ptr.h"
+#include "base/platform_file.h"
 #include "base/time.h"
-#include "webkit/blob/blob_export.h"
 #include "webkit/blob/file_stream_reader.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace base {
 class TaskRunner;
@@ -26,7 +26,7 @@ namespace webkit_blob {
 
 // A thin wrapper of net::FileStream with range support for sliced file
 // handling.
-class BLOB_EXPORT LocalFileStreamReader : public FileStreamReader {
+class WEBKIT_STORAGE_EXPORT LocalFileStreamReader : public FileStreamReader {
  public:
   // Creates a new FileReader for a local file |file_path|.
   // |initial_offset| specifies the offset in the file where the first read
diff --git a/webkit/blob/shareable_file_reference.h b/webkit/blob/shareable_file_reference.h
index 5f1ff32..1440586 100644
--- a/webkit/blob/shareable_file_reference.h
+++ b/webkit/blob/shareable_file_reference.h
@@ -10,7 +10,7 @@
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
-#include "webkit/blob/blob_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace base {
 class TaskRunner;
@@ -22,7 +22,7 @@ namespace webkit_blob {
 // the file to be deleted upon final release and/or to notify a consumer
 // when final release occurs. This class is single-threaded and should
 // only be invoked on the IO thread in chrome.
-class BLOB_EXPORT ShareableFileReference
+class WEBKIT_STORAGE_EXPORT ShareableFileReference
     : public base::RefCounted<ShareableFileReference> {
  public:
   typedef base::Callback<void(const FilePath&)> FinalReleaseCallback;
diff --git a/webkit/blob/view_blob_internals_job.h b/webkit/blob/view_blob_internals_job.h
index 17c3cf9..caee0b3 100644
--- a/webkit/blob/view_blob_internals_job.h
+++ b/webkit/blob/view_blob_internals_job.h
@@ -9,7 +9,7 @@
 
 #include "base/memory/weak_ptr.h"
 #include "net/url_request/url_request_simple_job.h"
-#include "webkit/blob/blob_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace net {
 class URLRequest;
@@ -22,7 +22,8 @@ class BlobStorageController;
 
 // A job subclass that implements a protocol to inspect the internal
 // state of blob registry.
-class BLOB_EXPORT ViewBlobInternalsJob : public net::URLRequestSimpleJob {
+class WEBKIT_STORAGE_EXPORT ViewBlobInternalsJob
+    : public net::URLRequestSimpleJob {
  public:
   ViewBlobInternalsJob(net::URLRequest* request,
                        net::NetworkDelegate* network_delegate,
diff --git a/webkit/blob/webkit_blob.gypi b/webkit/blob/webkit_blob.gypi
index 0e786c4..e15e4b0 100644
--- a/webkit/blob/webkit_blob.gypi
+++ b/webkit/blob/webkit_blob.gypi
@@ -4,54 +4,21 @@
 
 {
   'variables': {
-    'conditions': [
-      ['inside_chromium_build==0', {
-        'webkit_src_dir': '../../../../..',
-      },{
-        'webkit_src_dir': '../../third_party/WebKit',
-      }],
-      ],
-    },
-  'targets': [
-    {
-      'target_name': 'blob',
-      'type': '<(component)',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/base/base.gyp:base_i18n',
-        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
-        '<(DEPTH)/net/net.gyp:net',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
-        '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
-      ],
-      'defines': [
-        'BLOB_IMPLEMENTATION'
-      ],
-      'sources': [
-        'blob_data.cc',
-        'blob_data.h',
-        'blob_storage_controller.cc',
-        'blob_storage_controller.h',
-        'blob_url_request_job.cc',
-        'blob_url_request_job.h',
-        'blob_url_request_job_factory.cc',
-        'blob_url_request_job_factory.h',
-        'local_file_stream_reader.cc',
-        'local_file_stream_reader.h',
-        'shareable_file_reference.cc',
-        'shareable_file_reference.h',
-        'view_blob_internals_job.cc',
-        'view_blob_internals_job.h',
-      ],
-      'conditions': [
-        ['inside_chromium_build==0', {
-          'dependencies': [
-            '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
-          ],
-        }],
-      ],
-    },
-  ],
+    'webkit_blob_sources': [
+      '../blob/blob_data.cc',
+      '../blob/blob_data.h',
+      '../blob/blob_storage_controller.cc',
+      '../blob/blob_storage_controller.h',
+      '../blob/blob_url_request_job.cc',
+      '../blob/blob_url_request_job.h',
+      '../blob/blob_url_request_job_factory.cc',
+      '../blob/blob_url_request_job_factory.h',
+      '../blob/local_file_stream_reader.cc',
+      '../blob/local_file_stream_reader.h',
+      '../blob/shareable_file_reference.cc',
+      '../blob/shareable_file_reference.h',
+      '../blob/view_blob_internals_job.cc',
+      '../blob/view_blob_internals_job.h',
+    ],
+  },
 }