Rename storage-related export macros and build targets

webkit/browser/storage_export.h

Index: webkit/browser/storage_export.h
diff --git a/webkit/browser/webkit_storage_browser_export.h b/webkit/browser/storage_export.h
similarity index 37%
rename from webkit/browser/webkit_storage_browser_export.h
rename to webkit/browser/storage_export.h
index bfe2599b3ac0bd8a7143597d56231b1bc6430533..0f3f8b7eff93e87fd60cbd6b34e4b15825cdb85a 100644
--- a/webkit/browser/webkit_storage_browser_export.h
+++ b/webkit/browser/storage_export.h
@@ -2,33 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_BROWSER_WEBKIT_STORAGE_BROWSER_EXPORT_H_
-#define WEBKIT_BROWSER_WEBKIT_STORAGE_BROWSER_EXPORT_H_
+#ifndef WEBKIT_BROWSER_STORAGE_EXPORT_H_
+#define WEBKIT_BROWSER_STORAGE_EXPORT_H_
 
 #if defined(COMPONENT_BUILD)
 #if defined(WIN32)
 
 #if defined(WEBKIT_STORAGE_BROWSER_IMPLEMENTATION)
-#define WEBKIT_STORAGE_BROWSER_EXPORT __declspec(dllexport)
-#define WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE __declspec(dllexport)
+#define STORAGE_EXPORT __declspec(dllexport)
+#define STORAGE_EXPORT_PRIVATE __declspec(dllexport)
 #else
-#define WEBKIT_STORAGE_BROWSER_EXPORT __declspec(dllimport)
-#define WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE __declspec(dllimport)
+#define STORAGE_EXPORT __declspec(dllimport)
+#define STORAGE_EXPORT_PRIVATE __declspec(dllimport)
 #endif  // defined(BROWSER_IMPLEMENTATION)
 
 #else // defined(WIN32)
 #if defined(WEBKIT_STORAGE_BROWSER_IMPLEMENTATION)
-#define WEBKIT_STORAGE_BROWSER_EXPORT __attribute__((visibility("default")))
-#define WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE __attribute__((visibility("default")))
+#define STORAGE_EXPORT __attribute__((visibility("default")))
+#define STORAGE_EXPORT_PRIVATE __attribute__((visibility("default")))
 #else
-#define WEBKIT_STORAGE_BROWSER_EXPORT
-#define WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE
+#define STORAGE_EXPORT
+#define STORAGE_EXPORT_PRIVATE
 #endif
 #endif
 
 #else // defined(COMPONENT_BUILD)
-#define WEBKIT_STORAGE_BROWSER_EXPORT
-#define WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE
+#define STORAGE_EXPORT
+#define STORAGE_EXPORT_PRIVATE
 #endif
 
-#endif  // WEBKIT_BROWSER_WEBKIT_STORAGE_BROWSER_EXPORT_H_
+#endif  // WEBKIT_BROWSER_STORAGE_EXPORT_H_