webkit: Merge 'dom_storage' to 'webkit_storage'

Build target 'dom_storage' is merged into 'webkit_storage'
DOM_STORAGE_EXPORT is replaced with WEBKIT_STORAGE_EXPORT

BUG=155242
TEST=build

TBR=darin@chroimum.org for simple gyp chnages

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

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

14 files changed, 60 insertions, 113 deletions

diff --git a/webkit/dom_storage/dom_storage_area.h b/webkit/dom_storage/dom_storage_area.h
index b974cbb..e0953ff 100644
--- a/webkit/dom_storage/dom_storage_area.h
+++ b/webkit/dom_storage/dom_storage_area.h
@@ -12,8 +12,8 @@
 #include "base/nullable_string16.h"
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/dom_storage/dom_storage_export.h"
 #include "webkit/dom_storage/dom_storage_types.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace dom_storage {
 
@@ -25,7 +25,7 @@ class SessionStorageDatabase;
 // Container for a per-origin Map of key/value pairs potentially
 // backed by storage on disk and lazily commits changes to disk.
 // See class comments for DomStorageContext for a larger overview.
-class DOM_STORAGE_EXPORT DomStorageArea
+class WEBKIT_STORAGE_EXPORT DomStorageArea
     : public base::RefCountedThreadSafe<DomStorageArea> {
 
  public:
diff --git a/webkit/dom_storage/dom_storage_cached_area.h b/webkit/dom_storage/dom_storage_cached_area.h
index 3dee745..ae45a9c 100644
--- a/webkit/dom_storage/dom_storage_cached_area.h
+++ b/webkit/dom_storage/dom_storage_cached_area.h
@@ -11,7 +11,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/nullable_string16.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/dom_storage/dom_storage_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace dom_storage {
 
@@ -24,7 +24,7 @@ class DomStorageProxy;
 // first access and changes are written to the backend thru the |proxy|.
 // Mutations originating in other processes are applied to the cache via
 // the ApplyMutation method.
-class DOM_STORAGE_EXPORT DomStorageCachedArea :
+class WEBKIT_STORAGE_EXPORT DomStorageCachedArea :
       public base::RefCounted<DomStorageCachedArea> {
  public:
   DomStorageCachedArea(int64 namespace_id, const GURL& origin,
diff --git a/webkit/dom_storage/dom_storage_context.h b/webkit/dom_storage/dom_storage_context.h
index 7712e37..0f6fadc 100644
--- a/webkit/dom_storage/dom_storage_context.h
+++ b/webkit/dom_storage/dom_storage_context.h
@@ -17,7 +17,7 @@
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/dom_storage/dom_storage_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 class FilePath;
 class NullableString16;
@@ -57,10 +57,10 @@ class SessionStorageDatabase;
 // Classes intended to be used by an embedder are DomStorageContext,
 // DomStorageHost, and DomStorageSession. The other classes are for
 // internal consumption.
-class DOM_STORAGE_EXPORT DomStorageContext
+class WEBKIT_STORAGE_EXPORT DomStorageContext
     : public base::RefCountedThreadSafe<DomStorageContext> {
  public:
-  struct DOM_STORAGE_EXPORT LocalStorageUsageInfo {
+  struct WEBKIT_STORAGE_EXPORT LocalStorageUsageInfo {
     GURL origin;
     size_t data_size;
     base::Time last_modified;
@@ -69,7 +69,7 @@ class DOM_STORAGE_EXPORT DomStorageContext
     ~LocalStorageUsageInfo();
   };
 
-  struct DOM_STORAGE_EXPORT SessionStorageUsageInfo {
+  struct WEBKIT_STORAGE_EXPORT SessionStorageUsageInfo {
     GURL origin;
     std::string persistent_namespace_id;
 
diff --git a/webkit/dom_storage/dom_storage_database.h b/webkit/dom_storage/dom_storage_database.h
index 6cf2fed..e6fd0db 100644
--- a/webkit/dom_storage/dom_storage_database.h
+++ b/webkit/dom_storage/dom_storage_database.h
@@ -13,14 +13,14 @@
 #include "base/nullable_string16.h"
 #include "base/string16.h"
 #include "sql/connection.h"
-#include "webkit/dom_storage/dom_storage_export.h"
 #include "webkit/dom_storage/dom_storage_types.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace dom_storage {
 
 // Represents a SQLite based backing for DOM storage data. This
 // class is designed to be used on a single thread.
-class DOM_STORAGE_EXPORT DomStorageDatabase {
+class WEBKIT_STORAGE_EXPORT DomStorageDatabase {
  public:
   static FilePath GetJournalFilePath(const FilePath& database_path);
 
diff --git a/webkit/dom_storage/dom_storage_database_adapter.h b/webkit/dom_storage/dom_storage_database_adapter.h
index c75a0c1..d29d87b 100644
--- a/webkit/dom_storage/dom_storage_database_adapter.h
+++ b/webkit/dom_storage/dom_storage_database_adapter.h
@@ -9,12 +9,12 @@
 // the per-origin DomStorageDatabases for localStorage and
 // SessionStorageDatabase which stores multiple origins.
 
-#include "webkit/dom_storage/dom_storage_export.h"
 #include "webkit/dom_storage/dom_storage_types.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace dom_storage {
 
-class DOM_STORAGE_EXPORT DomStorageDatabaseAdapter {
+class WEBKIT_STORAGE_EXPORT DomStorageDatabaseAdapter {
  public:
   virtual ~DomStorageDatabaseAdapter() {}
   virtual void ReadAllValues(ValuesMap* result) = 0;
diff --git a/webkit/dom_storage/dom_storage_export.h b/webkit/dom_storage/dom_storage_export.h
deleted file mode 100644
index 34a2914..0000000
--- a/webkit/dom_storage/dom_storage_export.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// 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_DOM_STORAGE_DOM_STORAGE_EXPORT_H_
-#define WEBKIT_DOM_STORAGE_DOM_STORAGE_EXPORT_H_
-
-#if defined(COMPONENT_BUILD)
-#if defined(WIN32)
-
-#if defined(DOM_STORAGE_IMPLEMENTATION)
-#define DOM_STORAGE_EXPORT __declspec(dllexport)
-#else
-#define DOM_STORAGE_EXPORT __declspec(dllimport)
-#endif  // defined(DOM_STORAGE_IMPLEMENTATION)
-
-#else // defined(WIN32)
-#if defined(DOM_STORAGE_IMPLEMENTATION)
-#define DOM_STORAGE_EXPORT __attribute__((visibility("default")))
-#else
-#define DOM_STORAGE_EXPORT
-#endif
-#endif
-
-#else // defined(COMPONENT_BUILD)
-#define DOM_STORAGE_EXPORT
-#endif
-
-#endif  // WEBKIT_DOM_STORAGE_DOM_STORAGE_EXPORT_H_
diff --git a/webkit/dom_storage/dom_storage_host.h b/webkit/dom_storage/dom_storage_host.h
index 03611dc..54a18a4 100644
--- a/webkit/dom_storage/dom_storage_host.h
+++ b/webkit/dom_storage/dom_storage_host.h
@@ -10,8 +10,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/nullable_string16.h"
 #include "base/string16.h"
-#include "webkit/dom_storage/dom_storage_export.h"
 #include "webkit/dom_storage/dom_storage_types.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 class GURL;
 
@@ -27,7 +27,7 @@ class DomStorageArea;
 // This class is single threaded, and performs blocking file reads/writes,
 // so it shouldn't be used on chrome's IO thread.
 // See class comments for DomStorageContext for a larger overview.
-class DOM_STORAGE_EXPORT DomStorageHost {
+class WEBKIT_STORAGE_EXPORT DomStorageHost {
  public:
   explicit DomStorageHost(DomStorageContext* context);
   ~DomStorageHost();
diff --git a/webkit/dom_storage/dom_storage_map.h b/webkit/dom_storage/dom_storage_map.h
index e712be7..3a1d6f8 100644
--- a/webkit/dom_storage/dom_storage_map.h
+++ b/webkit/dom_storage/dom_storage_map.h
@@ -10,15 +10,15 @@
 #include "base/memory/ref_counted.h"
 #include "base/nullable_string16.h"
 #include "base/string16.h"
-#include "webkit/dom_storage/dom_storage_export.h"
 #include "webkit/dom_storage/dom_storage_types.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace dom_storage {
 
 // A wrapper around a std::map that adds refcounting and
 // tracks the size in bytes of the keys/values, enforcing a quota.
 // See class comments for DomStorageContext for a larger overview.
-class DOM_STORAGE_EXPORT DomStorageMap
+class WEBKIT_STORAGE_EXPORT DomStorageMap
     : public base::RefCountedThreadSafe<DomStorageMap> {
  public:
   explicit DomStorageMap(size_t quota);
diff --git a/webkit/dom_storage/dom_storage_namespace.h b/webkit/dom_storage/dom_storage_namespace.h
index e49c0fa..e1c72f0 100644
--- a/webkit/dom_storage/dom_storage_namespace.h
+++ b/webkit/dom_storage/dom_storage_namespace.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
-#include "webkit/dom_storage/dom_storage_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 class GURL;
 
@@ -22,7 +22,7 @@ class SessionStorageDatabase;
 
 // Container for the set of per-origin Areas.
 // See class comments for DomStorageContext for a larger overview.
-class DOM_STORAGE_EXPORT DomStorageNamespace
+class WEBKIT_STORAGE_EXPORT DomStorageNamespace
     : public base::RefCountedThreadSafe<DomStorageNamespace> {
  public:
   // Constructor for a LocalStorage namespace with id of 0
diff --git a/webkit/dom_storage/dom_storage_session.h b/webkit/dom_storage/dom_storage_session.h
index efb9131..065e75d 100644
--- a/webkit/dom_storage/dom_storage_session.h
+++ b/webkit/dom_storage/dom_storage_session.h
@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "webkit/dom_storage/dom_storage_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace dom_storage {
 
@@ -19,7 +19,7 @@ class DomStorageContext;
 // storage namespace and provides an interface to Clone() an
 // existing session storage namespace. It may be used on any thread.
 // See class comments for DomStorageContext for a larger overview.
-class DOM_STORAGE_EXPORT DomStorageSession
+class WEBKIT_STORAGE_EXPORT DomStorageSession
     : public base::RefCountedThreadSafe<DomStorageSession> {
  public:
   // Constructs a |DomStorageSession| and allocates new IDs for it.
diff --git a/webkit/dom_storage/dom_storage_task_runner.h b/webkit/dom_storage/dom_storage_task_runner.h
index 290e649..fd2efe9 100644
--- a/webkit/dom_storage/dom_storage_task_runner.h
+++ b/webkit/dom_storage/dom_storage_task_runner.h
@@ -9,7 +9,7 @@
 #include "base/sequenced_task_runner.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time.h"
-#include "webkit/dom_storage/dom_storage_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace base {
 class MessageLoopProxy;
@@ -26,7 +26,7 @@ namespace dom_storage {
 //   TODO(michaeln): Skip tasks for reading during shutdown.
 // * Internal tasks related to committing changes to disk are performed as
 //   shutdown-blocking commit sequence tasks.
-class DOM_STORAGE_EXPORT DomStorageTaskRunner : public base::TaskRunner {
+class WEBKIT_STORAGE_EXPORT DomStorageTaskRunner : public base::TaskRunner {
  public:
   enum SequenceID {
     PRIMARY_SEQUENCE,
@@ -66,7 +66,7 @@ class DOM_STORAGE_EXPORT DomStorageTaskRunner : public base::TaskRunner {
 // A derived class used in chromium that utilizes a SequenceWorkerPool
 // under dom_storage specific SequenceTokens. The |delayed_task_loop|
 // is used to delay scheduling on the worker pool.
-class DOM_STORAGE_EXPORT DomStorageWorkerPoolTaskRunner :
+class WEBKIT_STORAGE_EXPORT DomStorageWorkerPoolTaskRunner :
       public DomStorageTaskRunner {
  public:
   DomStorageWorkerPoolTaskRunner(
@@ -105,7 +105,7 @@ class DOM_STORAGE_EXPORT DomStorageWorkerPoolTaskRunner :
 // There is no distinction between [non]-shutdown-blocking or
 // the primary sequence vs the commit sequence in the mock,
 // all tasks are scheduled on |message_loop| with zero delay.
-class DOM_STORAGE_EXPORT MockDomStorageTaskRunner :
+class WEBKIT_STORAGE_EXPORT MockDomStorageTaskRunner :
       public DomStorageTaskRunner {
  public:
   explicit MockDomStorageTaskRunner(base::MessageLoopProxy* message_loop);
diff --git a/webkit/dom_storage/local_storage_database_adapter.h b/webkit/dom_storage/local_storage_database_adapter.h
index db6f9d4..f69e87b 100644
--- a/webkit/dom_storage/local_storage_database_adapter.h
+++ b/webkit/dom_storage/local_storage_database_adapter.h
@@ -7,8 +7,8 @@
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "webkit/dom_storage/dom_storage_export.h"
 #include "webkit/dom_storage/dom_storage_database_adapter.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 class FilePath;
 
@@ -16,7 +16,7 @@ namespace dom_storage {
 
 class DomStorageDatabase;
 
-class DOM_STORAGE_EXPORT LocalStorageDatabaseAdapter :
+class WEBKIT_STORAGE_EXPORT LocalStorageDatabaseAdapter :
       public DomStorageDatabaseAdapter {
  public:
   explicit LocalStorageDatabaseAdapter(const FilePath& path);
diff --git a/webkit/dom_storage/session_storage_database.h b/webkit/dom_storage/session_storage_database.h
index 1907d98..c9fc813 100644
--- a/webkit/dom_storage/session_storage_database.h
+++ b/webkit/dom_storage/session_storage_database.h
@@ -13,8 +13,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "third_party/leveldatabase/src/include/leveldb/status.h"
-#include "webkit/dom_storage/dom_storage_export.h"
 #include "webkit/dom_storage/dom_storage_types.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 class GURL;
 
@@ -33,7 +33,7 @@ namespace dom_storage {
 // Only one thread is allowed to call the public functions other than
 // ReadAreaValues and ReadNamespacesAndOrigins. Other threads are allowed to
 // call ReadAreaValues and ReadNamespacesAndOrigins.
-class DOM_STORAGE_EXPORT SessionStorageDatabase :
+class WEBKIT_STORAGE_EXPORT SessionStorageDatabase :
     public base::RefCountedThreadSafe<SessionStorageDatabase> {
  public:
   explicit SessionStorageDatabase(const FilePath& file_path);
diff --git a/webkit/dom_storage/webkit_dom_storage.gypi b/webkit/dom_storage/webkit_dom_storage.gypi
index 40079fa..3879150 100644
--- a/webkit/dom_storage/webkit_dom_storage.gypi
+++ b/webkit/dom_storage/webkit_dom_storage.gypi
@@ -3,60 +3,36 @@
 # found in the LICENSE file.
 
 {
-  'targets': [
-    {
-      'target_name': 'dom_storage',
-      'type': '<(component)',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'defines': ['DOM_STORAGE_IMPLEMENTATION'],
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/sql/sql.gyp:sql',
-        '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
-        '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:database',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:quota',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_storage',
-        '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
-      ],
-      'sources': [
-        'dom_storage_area.cc',
-        'dom_storage_area.h',
-        'dom_storage_cached_area.cc',
-        'dom_storage_cached_area.h',
-        'dom_storage_context.cc',
-        'dom_storage_context.h',
-        'dom_storage_database.cc',
-        'dom_storage_database.h',
-        'dom_storage_database_adapter.h',
-        'dom_storage_export.h',
-        'dom_storage_host.cc',
-        'dom_storage_host.h',
-        'dom_storage_map.cc',
-        'dom_storage_map.h',
-        'dom_storage_namespace.cc',
-        'dom_storage_namespace.h',
-        'dom_storage_proxy.h',
-        'dom_storage_session.cc',
-        'dom_storage_session.h',
-        'dom_storage_task_runner.cc',
-        'dom_storage_task_runner.h',
-        'dom_storage_types.h',
-        'local_storage_database_adapter.cc',
-        'local_storage_database_adapter.h',
-        'session_storage_database.cc',
-        'session_storage_database.h',
-        'session_storage_database_adapter.cc',
-        'session_storage_database_adapter.h',
-      ],
-      'conditions': [
-        ['inside_chromium_build==0', {
-          'dependencies': [
-            '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
-          ],
-        }],
-      ],
-    },
-  ],
+  'variables': {
+    'webkit_dom_storage_sources': [
+      '../dom_storage/dom_storage_area.cc',
+      '../dom_storage/dom_storage_area.h',
+      '../dom_storage/dom_storage_cached_area.cc',
+      '../dom_storage/dom_storage_cached_area.h',
+      '../dom_storage/dom_storage_context.cc',
+      '../dom_storage/dom_storage_context.h',
+      '../dom_storage/dom_storage_database.cc',
+      '../dom_storage/dom_storage_database.h',
+      '../dom_storage/dom_storage_database_adapter.h',
+      '../dom_storage/dom_storage_export.h',
+      '../dom_storage/dom_storage_host.cc',
+      '../dom_storage/dom_storage_host.h',
+      '../dom_storage/dom_storage_map.cc',
+      '../dom_storage/dom_storage_map.h',
+      '../dom_storage/dom_storage_namespace.cc',
+      '../dom_storage/dom_storage_namespace.h',
+      '../dom_storage/dom_storage_proxy.h',
+      '../dom_storage/dom_storage_session.cc',
+      '../dom_storage/dom_storage_session.h',
+      '../dom_storage/dom_storage_task_runner.cc',
+      '../dom_storage/dom_storage_task_runner.h',
+      '../dom_storage/dom_storage_types.h',
+      '../dom_storage/local_storage_database_adapter.cc',
+      '../dom_storage/local_storage_database_adapter.h',
+      '../dom_storage/session_storage_database.cc',
+      '../dom_storage/session_storage_database.h',
+      '../dom_storage/session_storage_database_adapter.cc',
+      '../dom_storage/session_storage_database_adapter.h',
+    ],
+  },
 }