webkit: Merge 'database' and 'quota' to 'webkit_storage'

webkit/quota/quota_database.h

Index: webkit/quota/quota_database.h
diff --git a/webkit/quota/quota_database.h b/webkit/quota/quota_database.h
index 1fed8fa085041a3f5ed2e610cd590903f8a0890d..24505597f437ad3a64f23fa2e3f6c31eb88c61a6 100644
--- a/webkit/quota/quota_database.h
+++ b/webkit/quota/quota_database.h
@@ -17,6 +17,7 @@
 #include "base/timer.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/quota/quota_types.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace sql {
 class Connection;
@@ -30,7 +31,7 @@ namespace quota {
 class SpecialStoragePolicy;
 
 // All the methods of this class must run on the DB thread.
-class QuotaDatabase {
+class WEBKIT_STORAGE_EXPORT_PRIVATE QuotaDatabase {
  public:
   // Constants for {Get,Set}QuotaConfigValue keys.
   static const char kDesiredAvailableSpaceKey[];
@@ -87,7 +88,7 @@ class QuotaDatabase {
   bool SetOriginDatabaseBootstrapped(bool bootstrap_flag);
 
  private:
-  struct QuotaTableEntry {
+  struct WEBKIT_STORAGE_EXPORT_PRIVATE QuotaTableEntry {
     QuotaTableEntry();
     QuotaTableEntry(
         const std::string& host,
@@ -97,10 +98,10 @@ class QuotaDatabase {
     StorageType type;
     int64 quota;
   };
-  friend bool operator <(const QuotaTableEntry& lhs,
-                         const QuotaTableEntry& rhs);
+  friend WEBKIT_STORAGE_EXPORT_PRIVATE bool operator <(
+      const QuotaTableEntry& lhs, const QuotaTableEntry& rhs);
 
-  struct OriginInfoTableEntry {
+  struct WEBKIT_STORAGE_EXPORT_PRIVATE OriginInfoTableEntry {
     OriginInfoTableEntry();
     OriginInfoTableEntry(
         const GURL& origin,
@@ -114,8 +115,8 @@ class QuotaDatabase {
     base::Time last_access_time;
     base::Time last_modified_time;
   };
-  friend bool operator <(const OriginInfoTableEntry& lhs,
-                         const OriginInfoTableEntry& rhs);
+  friend WEBKIT_STORAGE_EXPORT_PRIVATE bool operator <(
+      const OriginInfoTableEntry& lhs, const OriginInfoTableEntry& rhs);
 
   // Structures used for CreateSchema.
   struct TableSchema {