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

webkit/quota/quota_database.h

 // 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_QUOTA_QUOTA_DATABASE_H_
 #define WEBKIT_QUOTA_QUOTA_DATABASE_H_
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #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;
 class MetaTable;
 }
 
 class GURL;
 
 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[];
   static const char kTemporaryQuotaOverrideKey[];
 
   // If 'path' is empty, an in memory database will be used.
   explicit QuotaDatabase(const FilePath& path);
   ~QuotaDatabase();
 
   void CloseConnection();
@@ skipping 36 matching lines @@
                                std::set<GURL>* origins,
                                base::Time modified_since);
 
   // Returns false if SetOriginDatabaseBootstrapped has never
   // been called before, which means existing origins may not have been
   // registered.
   bool IsOriginDatabaseBootstrapped();
   bool SetOriginDatabaseBootstrapped(bool bootstrap_flag);
 
  private:
-  struct QuotaTableEntry {
+  struct WEBKIT_STORAGE_EXPORT_PRIVATE QuotaTableEntry {
     QuotaTableEntry();
     QuotaTableEntry(
         const std::string& host,
         StorageType type,
         int64 quota);
     std::string host;
     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,
         StorageType type,
         int used_count,
         const base::Time& last_access_time,
         const base::Time& last_modified_time);
     GURL origin;
     StorageType type;
     int used_count;
     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 {
     const char* table_name;
     const char* columns;
   };
   struct IndexSchema {
     const char* index_name;
     const char* table_name;
     const char* columns;
@@ skipping 47 matching lines @@
 
   static const TableSchema kTables[];
   static const IndexSchema kIndexes[];
 
   DISALLOW_COPY_AND_ASSIGN(QuotaDatabase);
 };
 
 }  // namespace quota
 
 #endif  // WEBKIT_QUOTA_QUOTA_DATABASE_H_