webkit: Merge build target 'appcache' to 'webkit_storage'

webkit/appcache/appcache_storage.h

Index: webkit/appcache/appcache_storage.h
diff --git a/webkit/appcache/appcache_storage.h b/webkit/appcache/appcache_storage.h
index c04315b3c714ecd8e46d3b96745947297049c355..20ca319c2387e5a95fa62f42e8c12f15f578bf86 100644
--- a/webkit/appcache/appcache_storage.h
+++ b/webkit/appcache/appcache_storage.h
@@ -8,14 +8,14 @@
 #include <map>
 #include <vector>
 
-#include "base/compiler_specific.h"
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/completion_callback.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_working_set.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 class GURL;
 
@@ -30,11 +30,11 @@ class AppCacheService;
 struct AppCacheInfoCollection;
 struct HttpResponseInfoIOBuffer;
 
-class APPCACHE_EXPORT AppCacheStorage {
+class WEBKIT_STORAGE_EXPORT AppCacheStorage {
  public:
   typedef std::map<GURL, int64> UsageMap;
 
-  class APPCACHE_EXPORT Delegate {
+  class WEBKIT_STORAGE_EXPORT Delegate {
    public:
     // If retrieval fails, 'collection' will be NULL.
     virtual void OnAllInfo(AppCacheInfoCollection* collection) {}