Combine storage_browser_export.h and storage_common_export.h

webkit/common/database/database_identifier.h

Index: webkit/common/database/database_identifier.h
diff --git a/webkit/common/database/database_identifier.h b/webkit/common/database/database_identifier.h
index 32037ddbe1b4490fe80ac20d9bad071cb5817a8f..e70db6f54f5fefaaacee63712077355725aff437 100644
--- a/webkit/common/database/database_identifier.h
+++ b/webkit/common/database/database_identifier.h
@@ -10,16 +10,16 @@
 #include "base/basictypes.h"
 #include "base/strings/string_piece.h"
 #include "url/gurl.h"
-#include "webkit/common/storage_common_export.h"
+#include "webkit/common/storage_export.h"
 
 namespace storage {
 
-WEBKIT_STORAGE_COMMON_EXPORT std::string GetIdentifierFromOrigin(
+STORAGE_EXPORT std::string GetIdentifierFromOrigin(
     const GURL& origin);
-WEBKIT_STORAGE_COMMON_EXPORT GURL GetOriginFromIdentifier(
+STORAGE_EXPORT GURL GetOriginFromIdentifier(
     const std::string& identifier);
 
-class WEBKIT_STORAGE_COMMON_EXPORT DatabaseIdentifier {
+class STORAGE_EXPORT DatabaseIdentifier {
  public:
   static const DatabaseIdentifier UniqueFileIdentifier();
   static DatabaseIdentifier CreateFromOrigin(const GURL& origin);