Combine storage_browser_export.h and storage_common_export.h

BUG=338338
TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/512253002

Cr-Commit-Position: refs/heads/master@{#292435}

77 files changed, 122 insertions, 123 deletions

diff --git a/webkit/browser/blob/blob_data_handle.h b/webkit/browser/blob/blob_data_handle.h
index 62df570..12b0431 100644
--- a/webkit/browser/blob/blob_data_handle.h
+++ b/webkit/browser/blob/blob_data_handle.h
@@ -10,7 +10,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/supports_user_data.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class SequencedTaskRunner;
diff --git a/webkit/browser/blob/blob_storage_context.h b/webkit/browser/blob/blob_storage_context.h
index ec573c2..68eef12 100644
--- a/webkit/browser/blob/blob_storage_context.h
+++ b/webkit/browser/blob/blob_storage_context.h
@@ -12,8 +12,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "webkit/browser/blob/blob_data_handle.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/blob/blob_data.h"
+#include "webkit/common/storage_export.h"
 
 class GURL;
 
diff --git a/webkit/browser/blob/blob_url_request_job.h b/webkit/browser/blob/blob_url_request_job.h
index ca80583..3b91320 100644
--- a/webkit/browser/blob/blob_url_request_job.h
+++ b/webkit/browser/blob/blob_url_request_job.h
@@ -12,8 +12,8 @@
 #include "net/http/http_byte_range.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_request_job.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/blob/blob_data.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class MessageLoopProxy;
diff --git a/webkit/browser/blob/blob_url_request_job_factory.h b/webkit/browser/blob/blob_url_request_job_factory.h
index 6721f00..66dec2d 100644
--- a/webkit/browser/blob/blob_url_request_job_factory.h
+++ b/webkit/browser/blob/blob_url_request_job_factory.h
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job_factory.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class MessageLoopProxy;
diff --git a/webkit/browser/blob/file_stream_reader.h b/webkit/browser/blob/file_stream_reader.h
index f5ab825..ecc7513 100644
--- a/webkit/browser/blob/file_stream_reader.h
+++ b/webkit/browser/blob/file_stream_reader.h
@@ -9,7 +9,7 @@
 #include "base/compiler_specific.h"
 #include "base/files/file.h"
 #include "net/base/completion_callback.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class FilePath;
diff --git a/webkit/browser/blob/local_file_stream_reader.h b/webkit/browser/blob/local_file_stream_reader.h
index fee34e4..e56f287 100644
--- a/webkit/browser/blob/local_file_stream_reader.h
+++ b/webkit/browser/blob/local_file_stream_reader.h
@@ -12,7 +12,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "webkit/browser/blob/file_stream_reader.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class TaskRunner;
diff --git a/webkit/browser/blob/view_blob_internals_job.h b/webkit/browser/blob/view_blob_internals_job.h
index 3d0bc6c..6c67ac4 100644
--- a/webkit/browser/blob/view_blob_internals_job.h
+++ b/webkit/browser/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/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace net {
 class URLRequest;
diff --git a/webkit/browser/database/database_quota_client.h b/webkit/browser/database/database_quota_client.h
index fb79032..e4ea5eb 100644
--- a/webkit/browser/database/database_quota_client.h
+++ b/webkit/browser/database/database_quota_client.h
@@ -11,8 +11,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "webkit/browser/quota/quota_client.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/quota/quota_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
diff --git a/webkit/browser/database/database_tracker.h b/webkit/browser/database/database_tracker.h
index 2d152450..48eaeaf 100644
--- a/webkit/browser/database/database_tracker.h
+++ b/webkit/browser/database/database_tracker.h
@@ -19,8 +19,8 @@
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "net/base/completion_callback.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/database/database_connections.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class MessageLoopProxy;
diff --git a/webkit/browser/database/database_util.h b/webkit/browser/database/database_util.h
index 3ef953a..bf631ea 100644
--- a/webkit/browser/database/database_util.h
+++ b/webkit/browser/database/database_util.h
@@ -8,7 +8,7 @@
 #include <string>
 #include "base/strings/string16.h"
 #include "url/gurl.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class FilePath;
diff --git a/webkit/browser/database/databases_table.h b/webkit/browser/database/databases_table.h
index 2dfb2ef..989f04c 100644
--- a/webkit/browser/database/databases_table.h
+++ b/webkit/browser/database/databases_table.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/strings/string16.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace sql {
 class Connection;
diff --git a/webkit/browser/database/vfs_backend.h b/webkit/browser/database/vfs_backend.h
index 7b95e02..89978980 100644
--- a/webkit/browser/database/vfs_backend.h
+++ b/webkit/browser/database/vfs_backend.h
@@ -8,7 +8,7 @@
 #include "base/files/file.h"
 #include "base/process/process.h"
 #include "base/strings/string16.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class FilePath;
diff --git a/webkit/browser/fileapi/async_file_util.h b/webkit/browser/fileapi/async_file_util.h
index e5d3606..954794f0 100644
--- a/webkit/browser/fileapi/async_file_util.h
+++ b/webkit/browser/fileapi/async_file_util.h
@@ -13,8 +13,8 @@
 #include "base/files/file_util_proxy.h"
 #include "base/memory/scoped_ptr.h"
 #include "webkit/browser/fileapi/file_system_operation.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/fileapi/directory_entry.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class Time;
diff --git a/webkit/browser/fileapi/copy_or_move_file_validator.h b/webkit/browser/fileapi/copy_or_move_file_validator.h
index 966f0f7..049dd58 100644
--- a/webkit/browser/fileapi/copy_or_move_file_validator.h
+++ b/webkit/browser/fileapi/copy_or_move_file_validator.h
@@ -7,7 +7,7 @@
 
 #include "base/callback.h"
 #include "base/files/file.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class FilePath;
diff --git a/webkit/browser/fileapi/dragged_file_util.h b/webkit/browser/fileapi/dragged_file_util.h
index 8999796..088683e 100644
--- a/webkit/browser/fileapi/dragged_file_util.h
+++ b/webkit/browser/fileapi/dragged_file_util.h
@@ -7,7 +7,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "webkit/browser/fileapi/local_file_util.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
diff --git a/webkit/browser/fileapi/external_mount_points.h b/webkit/browser/fileapi/external_mount_points.h
index ac01c8e..c450a80 100644
--- a/webkit/browser/fileapi/external_mount_points.h
+++ b/webkit/browser/fileapi/external_mount_points.h
@@ -12,9 +12,9 @@
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "webkit/browser/fileapi/mount_points.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/fileapi/file_system_mount_option.h"
 #include "webkit/common/fileapi/file_system_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class FilePath;
diff --git a/webkit/browser/fileapi/file_observers.h b/webkit/browser/fileapi/file_observers.h
index a1e5f76..a5cc48f 100644
--- a/webkit/browser/fileapi/file_observers.h
+++ b/webkit/browser/fileapi/file_observers.h
@@ -6,7 +6,7 @@
 #define WEBKIT_BROWSER_FILEAPI_FILE_OBSERVERS_H_
 
 #include "base/basictypes.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 // TODO(kinuko): Split this file into per-observer multiple files.
 
diff --git a/webkit/browser/fileapi/file_permission_policy.h b/webkit/browser/fileapi/file_permission_policy.h
index c01b388..9d92c52 100644
--- a/webkit/browser/fileapi/file_permission_policy.h
+++ b/webkit/browser/fileapi/file_permission_policy.h
@@ -5,7 +5,7 @@
 #ifndef WEBKIT_BROWSER_FILEAPI_FILE_PERMISSION_POLICY_H_
 #define WEBKIT_BROWSER_FILEAPI_FILE_PERMISSION_POLICY_H_
 
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
diff --git a/webkit/browser/fileapi/file_stream_writer.h b/webkit/browser/fileapi/file_stream_writer.h
index d4234cf..0c1648a 100644
--- a/webkit/browser/fileapi/file_stream_writer.h
+++ b/webkit/browser/fileapi/file_stream_writer.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "net/base/completion_callback.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class FilePath;
diff --git a/webkit/browser/fileapi/file_system_backend.h b/webkit/browser/fileapi/file_system_backend.h
index 7f0220d..ac39536 100644
--- a/webkit/browser/fileapi/file_system_backend.h
+++ b/webkit/browser/fileapi/file_system_backend.h
@@ -14,8 +14,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "webkit/browser/fileapi/file_permission_policy.h"
 #include "webkit/browser/fileapi/open_file_system_mode.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/fileapi/file_system_types.h"
+#include "webkit/common/storage_export.h"
 
 class GURL;
 
diff --git a/webkit/browser/fileapi/file_system_context.h b/webkit/browser/fileapi/file_system_context.h
index d9c1c45..8f636c4 100644
--- a/webkit/browser/fileapi/file_system_context.h
+++ b/webkit/browser/fileapi/file_system_context.h
@@ -20,8 +20,8 @@
 #include "webkit/browser/fileapi/plugin_private_file_system_backend.h"
 #include "webkit/browser/fileapi/sandbox_file_system_backend_delegate.h"
 #include "webkit/browser/fileapi/task_runner_bound_observer_list.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/fileapi/file_system_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class FilePath;
diff --git a/webkit/browser/fileapi/file_system_dir_url_request_job.h b/webkit/browser/fileapi/file_system_dir_url_request_job.h
index 1d60b09..7fdf876 100644
--- a/webkit/browser/fileapi/file_system_dir_url_request_job.h
+++ b/webkit/browser/fileapi/file_system_dir_url_request_job.h
@@ -14,7 +14,7 @@
 #include "base/message_loop/message_loop_proxy.h"
 #include "net/url_request/url_request_job.h"
 #include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
diff --git a/webkit/browser/fileapi/file_system_file_stream_reader.h b/webkit/browser/fileapi/file_system_file_stream_reader.h
index 4c3cd32..6cf4834 100644
--- a/webkit/browser/fileapi/file_system_file_stream_reader.h
+++ b/webkit/browser/fileapi/file_system_file_stream_reader.h
@@ -11,8 +11,8 @@
 #include "base/time/time.h"
 #include "webkit/browser/blob/file_stream_reader.h"
 #include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/blob/shareable_file_reference.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class FilePath;
diff --git a/webkit/browser/fileapi/file_system_file_util.h b/webkit/browser/fileapi/file_system_file_util.h
index 3a0c6b7..6e9d2ff 100644
--- a/webkit/browser/fileapi/file_system_file_util.h
+++ b/webkit/browser/fileapi/file_system_file_util.h
@@ -9,8 +9,8 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "webkit/browser/fileapi/file_system_operation.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/blob/scoped_file.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class Time;
diff --git a/webkit/browser/fileapi/file_system_operation.h b/webkit/browser/fileapi/file_system_operation.h
index 6d392f7..5cc2395 100644
--- a/webkit/browser/fileapi/file_system_operation.h
+++ b/webkit/browser/fileapi/file_system_operation.h
@@ -12,8 +12,8 @@
 #include "base/files/file_path.h"
 #include "base/process/process.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/fileapi/directory_entry.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class Time;
diff --git a/webkit/browser/fileapi/file_system_operation_context.h b/webkit/browser/fileapi/file_system_operation_context.h
index 2cd81f6..9b68a66 100644
--- a/webkit/browser/fileapi/file_system_operation_context.h
+++ b/webkit/browser/fileapi/file_system_operation_context.h
@@ -9,8 +9,8 @@
 #include "base/supports_user_data.h"
 #include "base/threading/thread_checker.h"
 #include "webkit/browser/fileapi/task_runner_bound_observer_list.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/quota/quota_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class SequencedTaskRunner;
diff --git a/webkit/browser/fileapi/file_system_operation_impl.h b/webkit/browser/fileapi/file_system_operation_impl.h
index 11eab94..1d1247b 100644
--- a/webkit/browser/fileapi/file_system_operation_impl.h
+++ b/webkit/browser/fileapi/file_system_operation_impl.h
@@ -14,9 +14,9 @@
 #include "webkit/browser/fileapi/file_system_operation_context.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/browser/fileapi/file_writer_delegate.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/blob/scoped_file.h"
 #include "webkit/common/quota/quota_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
diff --git a/webkit/browser/fileapi/file_system_operation_runner.h b/webkit/browser/fileapi/file_system_operation_runner.h
index f9e13b3..7ed3180 100644
--- a/webkit/browser/fileapi/file_system_operation_runner.h
+++ b/webkit/browser/fileapi/file_system_operation_runner.h
@@ -16,7 +16,7 @@
 #include "webkit/browser/blob/blob_data_handle.h"
 #include "webkit/browser/fileapi/file_system_operation.h"
 #include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace net {
 class URLRequestContext;
diff --git a/webkit/browser/fileapi/file_system_options.h b/webkit/browser/fileapi/file_system_options.h
index 545fc81..4609709 100644
--- a/webkit/browser/fileapi/file_system_options.h
+++ b/webkit/browser/fileapi/file_system_options.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace leveldb {
 class Env;
diff --git a/webkit/browser/fileapi/file_system_quota_client.h b/webkit/browser/fileapi/file_system_quota_client.h
index 74c3dfd..3dc6bc9 100644
--- a/webkit/browser/fileapi/file_system_quota_client.h
+++ b/webkit/browser/fileapi/file_system_quota_client.h
@@ -15,8 +15,8 @@
 #include "base/memory/ref_counted.h"
 #include "webkit/browser/fileapi/file_system_quota_util.h"
 #include "webkit/browser/quota/quota_client.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/fileapi/file_system_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class SequencedTaskRunner;
diff --git a/webkit/browser/fileapi/file_system_quota_util.h b/webkit/browser/fileapi/file_system_quota_util.h
index 3502064..bc3c2a7 100644
--- a/webkit/browser/fileapi/file_system_quota_util.h
+++ b/webkit/browser/fileapi/file_system_quota_util.h
@@ -12,8 +12,8 @@
 #include "base/files/file.h"
 #include "url/gurl.h"
 #include "webkit/browser/fileapi/task_runner_bound_observer_list.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/fileapi/file_system_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class SequencedTaskRunner;
diff --git a/webkit/browser/fileapi/file_system_url.h b/webkit/browser/fileapi/file_system_url.h
index bd92361..0551dc0 100644
--- a/webkit/browser/fileapi/file_system_url.h
+++ b/webkit/browser/fileapi/file_system_url.h
@@ -10,9 +10,9 @@
 
 #include "base/files/file_path.h"
 #include "url/gurl.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/fileapi/file_system_mount_option.h"
 #include "webkit/common/fileapi/file_system_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
diff --git a/webkit/browser/fileapi/file_system_url_request_job.h b/webkit/browser/fileapi/file_system_url_request_job.h
index e55b39d..d82da7d 100644
--- a/webkit/browser/fileapi/file_system_url_request_job.h
+++ b/webkit/browser/fileapi/file_system_url_request_job.h
@@ -14,7 +14,7 @@
 #include "net/http/http_byte_range.h"
 #include "net/url_request/url_request_job.h"
 #include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 class GURL;
 
diff --git a/webkit/browser/fileapi/file_system_url_request_job_factory.h b/webkit/browser/fileapi/file_system_url_request_job_factory.h
index 212e5dc..3106a82 100644
--- a/webkit/browser/fileapi/file_system_url_request_job_factory.h
+++ b/webkit/browser/fileapi/file_system_url_request_job_factory.h
@@ -9,7 +9,7 @@
 
 #include "net/url_request/url_request_job_factory.h"
 
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class MessageLoopProxy;
diff --git a/webkit/browser/fileapi/file_system_usage_cache.h b/webkit/browser/fileapi/file_system_usage_cache.h
index afb8c65..3a2499f 100644
--- a/webkit/browser/fileapi/file_system_usage_cache.h
+++ b/webkit/browser/fileapi/file_system_usage_cache.h
@@ -13,7 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
diff --git a/webkit/browser/fileapi/file_writer_delegate.h b/webkit/browser/fileapi/file_writer_delegate.h
index 2aac329..d27c415 100644
--- a/webkit/browser/fileapi/file_writer_delegate.h
+++ b/webkit/browser/fileapi/file_writer_delegate.h
@@ -13,7 +13,7 @@
 #include "net/base/file_stream.h"
 #include "net/base/io_buffer.h"
 #include "net/url_request/url_request.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
diff --git a/webkit/browser/fileapi/isolated_context.h b/webkit/browser/fileapi/isolated_context.h
index fea0bc0..b132c98 100644
--- a/webkit/browser/fileapi/isolated_context.h
+++ b/webkit/browser/fileapi/isolated_context.h
@@ -16,8 +16,8 @@
 #include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
 #include "webkit/browser/fileapi/mount_points.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/fileapi/file_system_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 class FileSystemURL;
diff --git a/webkit/browser/fileapi/local_file_stream_writer.h b/webkit/browser/fileapi/local_file_stream_writer.h
index 53c4402..b8fe4aa 100644
--- a/webkit/browser/fileapi/local_file_stream_writer.h
+++ b/webkit/browser/fileapi/local_file_stream_writer.h
@@ -15,7 +15,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/task_runner.h"
 #include "webkit/browser/fileapi/file_stream_writer.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace content {
 class LocalFileStreamWriterTest;
diff --git a/webkit/browser/fileapi/local_file_util.h b/webkit/browser/fileapi/local_file_util.h
index 4c20afc..41e6223 100644
--- a/webkit/browser/fileapi/local_file_util.h
+++ b/webkit/browser/fileapi/local_file_util.h
@@ -9,7 +9,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "webkit/browser/fileapi/file_system_file_util.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class Time;
diff --git a/webkit/browser/fileapi/mount_points.h b/webkit/browser/fileapi/mount_points.h
index 5a2b921..025e941 100644
--- a/webkit/browser/fileapi/mount_points.h
+++ b/webkit/browser/fileapi/mount_points.h
@@ -10,8 +10,8 @@
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/fileapi/file_system_util.h"
+#include "webkit/common/storage_export.h"
 
 class GURL;
 
diff --git a/webkit/browser/fileapi/native_file_util.h b/webkit/browser/fileapi/native_file_util.h
index d82c106..6e79abe 100644
--- a/webkit/browser/fileapi/native_file_util.h
+++ b/webkit/browser/fileapi/native_file_util.h
@@ -10,7 +10,7 @@
 #include "base/files/file_util_proxy.h"
 #include "base/memory/scoped_ptr.h"
 #include "webkit/browser/fileapi/file_system_file_util.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class Time;
diff --git a/webkit/browser/fileapi/obfuscated_file_util.h b/webkit/browser/fileapi/obfuscated_file_util.h
index b0a2e8b..6e8f237 100644
--- a/webkit/browser/fileapi/obfuscated_file_util.h
+++ b/webkit/browser/fileapi/obfuscated_file_util.h
@@ -20,9 +20,9 @@
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/browser/fileapi/sandbox_directory_database.h"
 #include "webkit/browser/fileapi/sandbox_file_system_backend_delegate.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/blob/shareable_file_reference.h"
 #include "webkit/common/fileapi/file_system_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class SequencedTaskRunner;
diff --git a/webkit/browser/fileapi/quota/open_file_handle.h b/webkit/browser/fileapi/quota/open_file_handle.h
index 24e014e..8692eff 100644
--- a/webkit/browser/fileapi/quota/open_file_handle.h
+++ b/webkit/browser/fileapi/quota/open_file_handle.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class FilePath;
diff --git a/webkit/browser/fileapi/quota/open_file_handle_context.h b/webkit/browser/fileapi/quota/open_file_handle_context.h
index bac0e6a..ed5918d 100644
--- a/webkit/browser/fileapi/quota/open_file_handle_context.h
+++ b/webkit/browser/fileapi/quota/open_file_handle_context.h
@@ -12,8 +12,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "url/gurl.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/fileapi/file_system_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
diff --git a/webkit/browser/fileapi/quota/quota_backend_impl.h b/webkit/browser/fileapi/quota/quota_backend_impl.h
index 275b483..0d0e9db 100644
--- a/webkit/browser/fileapi/quota/quota_backend_impl.h
+++ b/webkit/browser/fileapi/quota/quota_backend_impl.h
@@ -9,8 +9,8 @@
 #include "base/memory/weak_ptr.h"
 #include "webkit/browser/fileapi/quota/quota_reservation_manager.h"
 #include "webkit/browser/fileapi/sandbox_file_system_backend_delegate.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/quota/quota_status_code.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class SequencedTaskRunner;
diff --git a/webkit/browser/fileapi/quota/quota_reservation.h b/webkit/browser/fileapi/quota/quota_reservation.h
index fbcff92..bc04c6d 100644
--- a/webkit/browser/fileapi/quota/quota_reservation.h
+++ b/webkit/browser/fileapi/quota/quota_reservation.h
@@ -11,8 +11,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "webkit/browser/fileapi/quota/quota_reservation_manager.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/fileapi/file_system_types.h"
+#include "webkit/common/storage_export.h"
 
 class GURL;
 
diff --git a/webkit/browser/fileapi/quota/quota_reservation_buffer.h b/webkit/browser/fileapi/quota/quota_reservation_buffer.h
index 4ee71d8..663acca 100644
--- a/webkit/browser/fileapi/quota/quota_reservation_buffer.h
+++ b/webkit/browser/fileapi/quota/quota_reservation_buffer.h
@@ -13,8 +13,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "url/gurl.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/fileapi/file_system_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
diff --git a/webkit/browser/fileapi/quota/quota_reservation_manager.h b/webkit/browser/fileapi/quota/quota_reservation_manager.h
index dfb59ea..a6ea98c 100644
--- a/webkit/browser/fileapi/quota/quota_reservation_manager.h
+++ b/webkit/browser/fileapi/quota/quota_reservation_manager.h
@@ -14,8 +14,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "url/gurl.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/fileapi/file_system_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace content {
 class QuotaReservationManagerTest;
diff --git a/webkit/browser/fileapi/sandbox_directory_database.h b/webkit/browser/fileapi/sandbox_directory_database.h
index 8a583b6..bec9c01 100644
--- a/webkit/browser/fileapi/sandbox_directory_database.h
+++ b/webkit/browser/fileapi/sandbox_directory_database.h
@@ -12,7 +12,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace content {
 class SandboxDirectoryDatabaseTest;
diff --git a/webkit/browser/fileapi/sandbox_file_stream_writer.h b/webkit/browser/fileapi/sandbox_file_stream_writer.h
index f559096..c571c05 100644
--- a/webkit/browser/fileapi/sandbox_file_stream_writer.h
+++ b/webkit/browser/fileapi/sandbox_file_stream_writer.h
@@ -12,10 +12,10 @@
 #include "webkit/browser/fileapi/file_stream_writer.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/browser/fileapi/task_runner_bound_observer_list.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/blob/shareable_file_reference.h"
 #include "webkit/common/fileapi/file_system_types.h"
 #include "webkit/common/quota/quota_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
diff --git a/webkit/browser/fileapi/sandbox_file_system_backend.h b/webkit/browser/fileapi/sandbox_file_system_backend.h
index 7a60d4f..e02e1cb 100644
--- a/webkit/browser/fileapi/sandbox_file_system_backend.h
+++ b/webkit/browser/fileapi/sandbox_file_system_backend.h
@@ -17,7 +17,7 @@
 #include "webkit/browser/fileapi/sandbox_file_system_backend_delegate.h"
 #include "webkit/browser/fileapi/task_runner_bound_observer_list.h"
 #include "webkit/browser/quota/special_storage_policy.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
diff --git a/webkit/browser/fileapi/sandbox_file_system_backend_delegate.h b/webkit/browser/fileapi/sandbox_file_system_backend_delegate.h
index efd55f7..b08caab 100644
--- a/webkit/browser/fileapi/sandbox_file_system_backend_delegate.h
+++ b/webkit/browser/fileapi/sandbox_file_system_backend_delegate.h
@@ -20,7 +20,7 @@
 #include "webkit/browser/fileapi/file_system_backend.h"
 #include "webkit/browser/fileapi/file_system_options.h"
 #include "webkit/browser/fileapi/file_system_quota_util.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class SequencedTaskRunner;
diff --git a/webkit/browser/fileapi/sandbox_origin_database_interface.h b/webkit/browser/fileapi/sandbox_origin_database_interface.h
index 1f3d310..791c252 100644
--- a/webkit/browser/fileapi/sandbox_origin_database_interface.h
+++ b/webkit/browser/fileapi/sandbox_origin_database_interface.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/files/file_path.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
diff --git a/webkit/browser/fileapi/timed_task_helper.h b/webkit/browser/fileapi/timed_task_helper.h
index 6d454c9..bfe9da6 100644
--- a/webkit/browser/fileapi/timed_task_helper.h
+++ b/webkit/browser/fileapi/timed_task_helper.h
@@ -11,7 +11,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class SequencedTaskRunner;
diff --git a/webkit/browser/fileapi/transient_file_util.h b/webkit/browser/fileapi/transient_file_util.h
index 9ea3643..af03301 100644
--- a/webkit/browser/fileapi/transient_file_util.h
+++ b/webkit/browser/fileapi/transient_file_util.h
@@ -7,7 +7,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "webkit/browser/fileapi/local_file_util.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
diff --git a/webkit/browser/quota/quota_client.h b/webkit/browser/quota/quota_client.h
index 03e57d2..5ac4f9c 100644
--- a/webkit/browser/quota/quota_client.h
+++ b/webkit/browser/quota/quota_client.h
@@ -11,8 +11,8 @@
 
 #include "base/callback.h"
 #include "url/gurl.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/quota/quota_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
diff --git a/webkit/browser/quota/quota_database.h b/webkit/browser/quota/quota_database.h
index 137305c..a8d6853 100644
--- a/webkit/browser/quota/quota_database.h
+++ b/webkit/browser/quota/quota_database.h
@@ -16,8 +16,8 @@
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "url/gurl.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/quota/quota_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace content {
 class QuotaDatabaseTest;
diff --git a/webkit/browser/quota/quota_manager.h b/webkit/browser/quota/quota_manager.h
index e641b3c..1e26c74 100644
--- a/webkit/browser/quota/quota_manager.h
+++ b/webkit/browser/quota/quota_manager.h
@@ -26,7 +26,7 @@
 #include "webkit/browser/quota/quota_task.h"
 #include "webkit/browser/quota/special_storage_policy.h"
 #include "webkit/browser/quota/storage_observer.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class FilePath;
diff --git a/webkit/browser/quota/quota_manager_proxy.h b/webkit/browser/quota/quota_manager_proxy.h
index a1d38a8..8303596 100644
--- a/webkit/browser/quota/quota_manager_proxy.h
+++ b/webkit/browser/quota/quota_manager_proxy.h
@@ -18,7 +18,7 @@
 #include "webkit/browser/quota/quota_manager.h"
 #include "webkit/browser/quota/quota_task.h"
 #include "webkit/browser/quota/special_storage_policy.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class SequencedTaskRunner;
diff --git a/webkit/browser/quota/quota_task.h b/webkit/browser/quota/quota_task.h
index 7b0ce18..fd0468b 100644
--- a/webkit/browser/quota/quota_task.h
+++ b/webkit/browser/quota/quota_task.h
@@ -11,7 +11,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/sequenced_task_runner_helpers.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class SingleThreadTaskRunner;
diff --git a/webkit/browser/quota/quota_temporary_storage_evictor.h b/webkit/browser/quota/quota_temporary_storage_evictor.h
index 958b877..c9665d5 100644
--- a/webkit/browser/quota/quota_temporary_storage_evictor.h
+++ b/webkit/browser/quota/quota_temporary_storage_evictor.h
@@ -11,8 +11,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/timer/timer.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/quota/quota_types.h"
+#include "webkit/common/storage_export.h"
 
 class GURL;
 
diff --git a/webkit/browser/quota/special_storage_policy.h b/webkit/browser/quota/special_storage_policy.h
index a6cd8aa..e187dd5 100644
--- a/webkit/browser/quota/special_storage_policy.h
+++ b/webkit/browser/quota/special_storage_policy.h
@@ -9,7 +9,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
-#include "webkit/browser/storage_export.h"
+#include "webkit/common/storage_export.h"
 
 class GURL;
 
diff --git a/webkit/browser/quota/usage_tracker.h b/webkit/browser/quota/usage_tracker.h
index c47d402..a8f5c79 100644
--- a/webkit/browser/quota/usage_tracker.h
+++ b/webkit/browser/quota/usage_tracker.h
@@ -19,8 +19,8 @@
 #include "webkit/browser/quota/quota_client.h"
 #include "webkit/browser/quota/quota_task.h"
 #include "webkit/browser/quota/special_storage_policy.h"
-#include "webkit/browser/storage_export.h"
 #include "webkit/common/quota/quota_types.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
diff --git a/webkit/common/BUILD.gn b/webkit/common/BUILD.gn
index 4761a77..d56622c 100644
--- a/webkit/common/BUILD.gn
+++ b/webkit/common/BUILD.gn
@@ -23,7 +23,7 @@ component("common") {
 component("storage") {
   output_name = "storage_common"
   sources = [
-    "storage_common_export.h",
+    "storage_export.h",
     "blob/blob_data.cc",
     "blob/blob_data.h",
     "blob/scoped_file.cc",
diff --git a/webkit/common/blob/blob_data.h b/webkit/common/blob/blob_data.h
index ede1bca..5419329 100644
--- a/webkit/common/blob/blob_data.h
+++ b/webkit/common/blob/blob_data.h
@@ -15,11 +15,11 @@
 #include "url/gurl.h"
 #include "webkit/common/blob/shareable_file_reference.h"
 #include "webkit/common/data_element.h"
-#include "webkit/common/storage_common_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
-class WEBKIT_STORAGE_COMMON_EXPORT BlobData
+class STORAGE_EXPORT BlobData
     : public base::RefCounted<BlobData> {
  public:
   typedef storage::DataElement Item;
diff --git a/webkit/common/blob/scoped_file.h b/webkit/common/blob/scoped_file.h
index a435725..5c2eb9b 100644
--- a/webkit/common/blob/scoped_file.h
+++ b/webkit/common/blob/scoped_file.h
@@ -11,7 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/move.h"
-#include "webkit/common/storage_common_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class TaskRunner;
@@ -26,7 +26,7 @@ namespace storage {
 //
 // TODO(kinuko): Probably this can be moved under base or somewhere more
 // common place.
-class WEBKIT_STORAGE_COMMON_EXPORT ScopedFile {
+class STORAGE_EXPORT ScopedFile {
   // To support destructive assignment from an l-value assignment.
   // This provides Pass() method which creates an r-value for the current
   // instance. (See base/move.h for details)
diff --git a/webkit/common/blob/shareable_file_reference.h b/webkit/common/blob/shareable_file_reference.h
index 2e1f031..ac71351 100644
--- a/webkit/common/blob/shareable_file_reference.h
+++ b/webkit/common/blob/shareable_file_reference.h
@@ -15,7 +15,7 @@ namespace storage {
 // same path if it already exists in its internal map.
 // This class is non-thread-safe and all methods must be called on a single
 // thread.
-class WEBKIT_STORAGE_COMMON_EXPORT ShareableFileReference
+class STORAGE_EXPORT ShareableFileReference
     : public base::RefCounted<ShareableFileReference> {
  public:
   typedef ScopedFile::ScopeOutCallback FinalReleaseCallback;
diff --git a/webkit/common/database/database_connections.h b/webkit/common/database/database_connections.h
index 0b1b353..4e3440b 100644
--- a/webkit/common/database/database_connections.h
+++ b/webkit/common/database/database_connections.h
@@ -12,7 +12,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
-#include "webkit/common/storage_common_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace base {
 class MessageLoopProxy;
@@ -20,7 +20,7 @@ class MessageLoopProxy;
 
 namespace storage {
 
-class WEBKIT_STORAGE_COMMON_EXPORT DatabaseConnections {
+class STORAGE_EXPORT DatabaseConnections {
  public:
   DatabaseConnections();
   ~DatabaseConnections();
@@ -69,7 +69,7 @@ class WEBKIT_STORAGE_COMMON_EXPORT DatabaseConnections {
 // A wrapper class that provides thread-safety and the
 // ability to wait until all connections have closed.
 // Intended for use in renderer processes.
-class WEBKIT_STORAGE_COMMON_EXPORT DatabaseConnectionsWrapper
+class STORAGE_EXPORT DatabaseConnectionsWrapper
     : public base::RefCountedThreadSafe<DatabaseConnectionsWrapper> {
  public:
   DatabaseConnectionsWrapper();
diff --git a/webkit/common/database/database_identifier.h b/webkit/common/database/database_identifier.h
index 32037dd..e70db6f 100644
--- a/webkit/common/database/database_identifier.h
+++ b/webkit/common/database/database_identifier.h
@@ -10,16 +10,16 @@
 #include "base/basictypes.h"
 #include "base/strings/string_piece.h"
 #include "url/gurl.h"
-#include "webkit/common/storage_common_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
-WEBKIT_STORAGE_COMMON_EXPORT std::string GetIdentifierFromOrigin(
+STORAGE_EXPORT std::string GetIdentifierFromOrigin(
     const GURL& origin);
-WEBKIT_STORAGE_COMMON_EXPORT GURL GetOriginFromIdentifier(
+STORAGE_EXPORT GURL GetOriginFromIdentifier(
     const std::string& identifier);
 
-class WEBKIT_STORAGE_COMMON_EXPORT DatabaseIdentifier {
+class STORAGE_EXPORT DatabaseIdentifier {
  public:
   static const DatabaseIdentifier UniqueFileIdentifier();
   static DatabaseIdentifier CreateFromOrigin(const GURL& origin);
diff --git a/webkit/common/fileapi/directory_entry.h b/webkit/common/fileapi/directory_entry.h
index 1d8b69f..4763e78 100644
--- a/webkit/common/fileapi/directory_entry.h
+++ b/webkit/common/fileapi/directory_entry.h
@@ -10,12 +10,12 @@
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/time/time.h"
-#include "webkit/common/storage_common_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
 // Holds metadata for file or directory entry.
-struct WEBKIT_STORAGE_COMMON_EXPORT DirectoryEntry {
+struct STORAGE_EXPORT DirectoryEntry {
   enum DirectoryEntryType {
     FILE,
     DIRECTORY,
diff --git a/webkit/common/fileapi/file_system_info.h b/webkit/common/fileapi/file_system_info.h
index 93f423c..24c0338 100644
--- a/webkit/common/fileapi/file_system_info.h
+++ b/webkit/common/fileapi/file_system_info.h
@@ -9,14 +9,14 @@
 
 #include "url/gurl.h"
 #include "webkit/common/fileapi/file_system_types.h"
-#include "webkit/common/storage_common_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
 // This struct is used to send the necessary information for Blink to create a
 // DOMFileSystem.  Since Blink side only uses mount_type (rather than
 // detailed/cracked filesystem type) this only contains mount_type but not type.
-struct WEBKIT_STORAGE_COMMON_EXPORT FileSystemInfo {
+struct STORAGE_EXPORT FileSystemInfo {
   FileSystemInfo();
   FileSystemInfo(const std::string& filesystem_name,
                  const GURL& root_url,
diff --git a/webkit/common/fileapi/file_system_util.h b/webkit/common/fileapi/file_system_util.h
index e92625c..1f45896 100644
--- a/webkit/common/fileapi/file_system_util.h
+++ b/webkit/common/fileapi/file_system_util.h
@@ -15,19 +15,19 @@
 #include "webkit/common/fileapi/file_system_info.h"
 #include "webkit/common/fileapi/file_system_types.h"
 #include "webkit/common/quota/quota_types.h"
-#include "webkit/common/storage_common_export.h"
+#include "webkit/common/storage_export.h"
 
 class GURL;
 
 namespace storage {
 
-WEBKIT_STORAGE_COMMON_EXPORT extern const char kPersistentDir[];
-WEBKIT_STORAGE_COMMON_EXPORT extern const char kTemporaryDir[];
-WEBKIT_STORAGE_COMMON_EXPORT extern const char kExternalDir[];
-WEBKIT_STORAGE_COMMON_EXPORT extern const char kIsolatedDir[];
-WEBKIT_STORAGE_COMMON_EXPORT extern const char kTestDir[];
+STORAGE_EXPORT extern const char kPersistentDir[];
+STORAGE_EXPORT extern const char kTemporaryDir[];
+STORAGE_EXPORT extern const char kExternalDir[];
+STORAGE_EXPORT extern const char kIsolatedDir[];
+STORAGE_EXPORT extern const char kTestDir[];
 
-class WEBKIT_STORAGE_COMMON_EXPORT VirtualPath {
+class STORAGE_EXPORT VirtualPath {
  public:
   static const base::FilePath::CharType kRoot[];
   static const base::FilePath::CharType kSeparator;
@@ -69,7 +69,7 @@ class WEBKIT_STORAGE_COMMON_EXPORT VirtualPath {
 // Example: For a URL 'filesystem:http://foo.com/temporary/foo/bar',
 // |origin_url| is set to 'http://foo.com', |type| is set to
 // kFileSystemTypeTemporary, and |virtual_path| is set to 'foo/bar'.
-WEBKIT_STORAGE_COMMON_EXPORT bool ParseFileSystemSchemeURL(
+STORAGE_EXPORT bool ParseFileSystemSchemeURL(
     const GURL& url,
     GURL* origin_url,
     FileSystemType* type,
@@ -84,7 +84,7 @@ WEBKIT_STORAGE_COMMON_EXPORT bool ParseFileSystemSchemeURL(
 // returns URL without the filesystem ID.
 //
 // |type| needs to be public type as the returned URI is given to the renderer.
-WEBKIT_STORAGE_COMMON_EXPORT GURL GetFileSystemRootURI(const GURL& origin_url,
+STORAGE_EXPORT GURL GetFileSystemRootURI(const GURL& origin_url,
                                                        FileSystemType type);
 
 // Returns the name for the filesystem that is specified by a pair of
@@ -98,27 +98,27 @@ WEBKIT_STORAGE_COMMON_EXPORT GURL GetFileSystemRootURI(const GURL& origin_url,
 // Example:
 //   The name for a TEMPORARY filesystem of "http://www.example.com:80/"
 //   should look like: "http_www.example.host_80:temporary"
-WEBKIT_STORAGE_COMMON_EXPORT std::string
+STORAGE_EXPORT std::string
 GetFileSystemName(const GURL& origin_url, FileSystemType type);
 
 // Converts FileSystemType |type| to/from the StorageType |storage_type| that
 // is used for the unified quota system.
 // (Basically this naively maps TEMPORARY storage type to TEMPORARY filesystem
 // type, PERSISTENT storage type to PERSISTENT filesystem type and vice versa.)
-WEBKIT_STORAGE_COMMON_EXPORT FileSystemType
+STORAGE_EXPORT FileSystemType
     QuotaStorageTypeToFileSystemType(storage::StorageType storage_type);
 
-WEBKIT_STORAGE_COMMON_EXPORT storage::StorageType
+STORAGE_EXPORT storage::StorageType
     FileSystemTypeToQuotaStorageType(FileSystemType type);
 
 // Returns the string representation of the given filesystem |type|.
 // Returns an empty string if the |type| is invalid.
-WEBKIT_STORAGE_COMMON_EXPORT std::string
+STORAGE_EXPORT std::string
 GetFileSystemTypeString(FileSystemType type);
 
 // Sets type to FileSystemType enum that corresponds to the string name.
 // Returns false if the |type_string| is invalid.
-WEBKIT_STORAGE_COMMON_EXPORT bool GetFileSystemPublicType(
+STORAGE_EXPORT bool GetFileSystemPublicType(
     std::string type_string,
     blink::WebFileSystemType* type);
 
@@ -130,20 +130,20 @@ WEBKIT_STORAGE_COMMON_EXPORT bool GetFileSystemPublicType(
 //
 // TODO(tzik): Replace CreateFilePath and FilePathToString in
 // third_party/leveldatabase/env_chromium.cc with them.
-WEBKIT_STORAGE_COMMON_EXPORT std::string FilePathToString(
+STORAGE_EXPORT std::string FilePathToString(
     const base::FilePath& file_path);
 
 // Decode a file path from |file_path_string|.
-WEBKIT_STORAGE_COMMON_EXPORT base::FilePath StringToFilePath(
+STORAGE_EXPORT base::FilePath StringToFilePath(
     const std::string& file_path_string);
 
 // File error conversion
-WEBKIT_STORAGE_COMMON_EXPORT blink::WebFileError
+STORAGE_EXPORT blink::WebFileError
 FileErrorToWebFileError(base::File::Error error_code);
 
 // Generate a file system name for the given arguments. Should only be used by
 // platform apps.
-WEBKIT_STORAGE_COMMON_EXPORT std::string GetIsolatedFileSystemName(
+STORAGE_EXPORT std::string GetIsolatedFileSystemName(
     const GURL& origin_url,
     const std::string& filesystem_id);
 
@@ -151,30 +151,30 @@ WEBKIT_STORAGE_COMMON_EXPORT std::string GetIsolatedFileSystemName(
 // platform apps. This function will return false if the file system name is
 // not of the form {origin}:Isolated_{id}, and will also check that there is an
 // origin and id present. It will not check that the origin or id are valid.
-WEBKIT_STORAGE_COMMON_EXPORT bool CrackIsolatedFileSystemName(
+STORAGE_EXPORT bool CrackIsolatedFileSystemName(
     const std::string& filesystem_name,
     std::string* filesystem_id);
 
 // Validates the given isolated file system id.
-WEBKIT_STORAGE_COMMON_EXPORT bool ValidateIsolatedFileSystemId(
+STORAGE_EXPORT bool ValidateIsolatedFileSystemId(
     const std::string& filesystem_id);
 
 // Returns the root URI for an isolated filesystem for origin |origin_url|
 // and |filesystem_id|. If the |optional_root_name| is given the resulting
 // root URI will point to the subfolder within the isolated filesystem.
-WEBKIT_STORAGE_COMMON_EXPORT std::string GetIsolatedFileSystemRootURIString(
+STORAGE_EXPORT std::string GetIsolatedFileSystemRootURIString(
     const GURL& origin_url,
     const std::string& filesystem_id,
     const std::string& optional_root_name);
 
 // Returns the root URI for an external filesystem for origin |origin_url|
 // and |mount_name|.
-WEBKIT_STORAGE_COMMON_EXPORT std::string GetExternalFileSystemRootURIString(
+STORAGE_EXPORT std::string GetExternalFileSystemRootURIString(
     const GURL& origin_url,
     const std::string& mount_name);
 
 // Translates the net::Error to base::File::Error.
-WEBKIT_STORAGE_COMMON_EXPORT base::File::Error
+STORAGE_EXPORT base::File::Error
 NetErrorToFileError(int error);
 
 }  // namespace storage
diff --git a/webkit/common/quota/quota_status_code.h b/webkit/common/quota/quota_status_code.h
index 2c6acd8..707fb01 100644
--- a/webkit/common/quota/quota_status_code.h
+++ b/webkit/common/quota/quota_status_code.h
@@ -6,7 +6,7 @@
 #define WEBKIT_COMMON_QUOTA_QUOTA_STATUS_CODE_H_
 
 #include "third_party/WebKit/public/platform/WebStorageQuotaError.h"
-#include "webkit/common/storage_common_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
@@ -20,7 +20,7 @@ enum QuotaStatusCode {
   kQuotaStatusUnknown = -1,
 };
 
-WEBKIT_STORAGE_COMMON_EXPORT const char* QuotaStatusCodeToString(
+STORAGE_EXPORT const char* QuotaStatusCodeToString(
     QuotaStatusCode status);
 
 }  // namespace storage
diff --git a/webkit/common/storage_common_export.h b/webkit/common/storage_common_export.h
index 302ddee..842752f 100644
--- a/webkit/common/storage_common_export.h
+++ b/webkit/common/storage_common_export.h
@@ -2,28 +2,28 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_COMMON_WEBKIT_STORAGE_COMMON_EXPORT_H_
-#define WEBKIT_COMMON_WEBKIT_STORAGE_COMMON_EXPORT_H_
+#ifndef WEBKIT_COMMON_STORAGE_EXPORT_H_
+#define WEBKIT_COMMON_STORAGE_EXPORT_H_
 
 #if defined(COMPONENT_BUILD)
 #if defined(WIN32)
 
 #if defined(WEBKIT_STORAGE_COMMON_IMPLEMENTATION)
-#define WEBKIT_STORAGE_COMMON_EXPORT __declspec(dllexport)
+#define STORAGE_EXPORT __declspec(dllexport)
 #else
-#define WEBKIT_STORAGE_COMMON_EXPORT __declspec(dllimport)
+#define STORAGE_EXPORT __declspec(dllimport)
 #endif  // defined(WEBKIT_STORAGE_COMMON_IMPLEMENTATION)
 
 #else // defined(WIN32)
 #if defined(WEBKIT_STORAGE_COMMON_IMPLEMENTATION)
-#define WEBKIT_STORAGE_COMMON_EXPORT __attribute__((visibility("default")))
+#define STORAGE_EXPORT __attribute__((visibility("default")))
 #else
-#define WEBKIT_STORAGE_COMMON_EXPORT
+#define STORAGE_EXPORT
 #endif
 #endif
 
 #else // defined(COMPONENT_BUILD)
-#define WEBKIT_STORAGE_COMMON_EXPORT
+#define STORAGE_EXPORT
 #endif
 
-#endif  // WEBKIT_COMMON_WEBKIT_STORAGE_COMMON_EXPORT_H_
+#endif  // WEBKIT_COMMON_STORAGE_EXPORT_H_
diff --git a/webkit/browser/storage_export.h b/webkit/common/storage_export.h
index 0f3f8b7..3d85ab4 100644
--- a/webkit/browser/storage_export.h
+++ b/webkit/common/storage_export.h
@@ -2,22 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_BROWSER_STORAGE_EXPORT_H_
-#define WEBKIT_BROWSER_STORAGE_EXPORT_H_
+#ifndef WEBKIT_COMMON_STORAGE_EXPORT_H_
+#define WEBKIT_COMMON_STORAGE_EXPORT_H_
 
 #if defined(COMPONENT_BUILD)
 #if defined(WIN32)
 
-#if defined(WEBKIT_STORAGE_BROWSER_IMPLEMENTATION)
+#if defined(STORAGE_IMPLEMENTATION)
 #define STORAGE_EXPORT __declspec(dllexport)
 #define STORAGE_EXPORT_PRIVATE __declspec(dllexport)
 #else
 #define STORAGE_EXPORT __declspec(dllimport)
 #define STORAGE_EXPORT_PRIVATE __declspec(dllimport)
-#endif  // defined(BROWSER_IMPLEMENTATION)
+#endif  // defined(STORAGE_IMPLEMENTATION)
 
 #else // defined(WIN32)
-#if defined(WEBKIT_STORAGE_BROWSER_IMPLEMENTATION)
+#if defined(STORAGE_IMPLEMENTATION)
 #define STORAGE_EXPORT __attribute__((visibility("default")))
 #define STORAGE_EXPORT_PRIVATE __attribute__((visibility("default")))
 #else
@@ -31,4 +31,4 @@
 #define STORAGE_EXPORT_PRIVATE
 #endif
 
-#endif  // WEBKIT_BROWSER_STORAGE_EXPORT_H_
+#endif  // WEBKIT_COMMON_STORAGE_EXPORT_H_
diff --git a/webkit/storage_browser.gyp b/webkit/storage_browser.gyp
index 5083a3d..9ff06aa 100644
--- a/webkit/storage_browser.gyp
+++ b/webkit/storage_browser.gyp
@@ -24,9 +24,8 @@
         '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common',
         '<(DEPTH)/webkit/storage_common.gyp:storage_common',
       ],
-      'defines': ['WEBKIT_STORAGE_BROWSER_IMPLEMENTATION'],
+      'defines': ['STORAGE_IMPLEMENTATION'],
       'sources': [
-        'browser/storage_export.h',
         'browser/blob/blob_data_handle.cc',
         'browser/blob/blob_data_handle.h',
         'browser/blob/blob_storage_context.cc',
diff --git a/webkit/storage_common.gyp b/webkit/storage_common.gyp
index 63c9e3e..e812356 100644
--- a/webkit/storage_common.gyp
+++ b/webkit/storage_common.gyp
@@ -19,9 +19,9 @@
         '<(DEPTH)/url/url.gyp:url_lib',
         '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common',
       ],
-      'defines': ['WEBKIT_STORAGE_COMMON_IMPLEMENTATION'],
+      'defines': ['STORAGE_IMPLEMENTATION'],
       'sources': [
-        'common/storage_common_export.h',
+        'common/storage_export.h',
         'common/blob/blob_data.cc',
         'common/blob/blob_data.h',
         'common/blob/scoped_file.cc',