Index: storage/common/database/database_connections.h |
diff --git a/webkit/common/database/database_connections.h b/storage/common/database/database_connections.h |
similarity index 93% |
rename from webkit/common/database/database_connections.h |
rename to storage/common/database/database_connections.h |
index 83896fd5d9f861810a2f855493723c5e32d6c46b..2a108538f152be82c3ba6d5b430e7e979c1a85af 100644 |
--- a/webkit/common/database/database_connections.h |
+++ b/storage/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/webkit_storage_common_export.h" |
+#include "storage/common/storage_export.h" |
namespace base { |
class MessageLoopProxy; |
@@ -20,7 +20,7 @@ class MessageLoopProxy; |
namespace webkit_database { |
-class WEBKIT_STORAGE_COMMON_EXPORT DatabaseConnections { |
+class STORAGE_EXPORT DatabaseConnections { |
public: |
DatabaseConnections(); |
~DatabaseConnections(); |
@@ -52,7 +52,7 @@ class WEBKIT_STORAGE_COMMON_EXPORT DatabaseConnections { |
// Returns a list of the connections, <origin_id, name>. |
void ListConnections( |
- std::vector<std::pair<std::string, base::string16> > *list) const; |
+ std::vector<std::pair<std::string, base::string16> >* list) const; |
private: |
// Mapping from name to <openCount, size> |
@@ -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(); |
@@ -84,6 +84,7 @@ class WEBKIT_STORAGE_COMMON_EXPORT DatabaseConnectionsWrapper |
const base::string16& database_name); |
void RemoveOpenConnection(const std::string& origin_identifier, |
const base::string16& database_name); |
+ |
private: |
~DatabaseConnectionsWrapper(); |
friend class base::RefCountedThreadSafe<DatabaseConnectionsWrapper>; |