Combine storage_browser_export.h and storage_common_export.h

webkit/common/database/database_connections.h

Index: webkit/common/database/database_connections.h
diff --git a/webkit/common/database/database_connections.h b/webkit/common/database/database_connections.h
index 0b1b353c696562bd9ae5e4012a059bfaae4dd44a..4e3440b870c4d5d802dec90678dec6f6ab01e848 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();