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

webkit/appcache/appcache_storage.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_APPCACHE_APPCACHE_STORAGE_H_
 #define WEBKIT_APPCACHE_APPCACHE_STORAGE_H_
 
 #include <map>
 #include <vector>
 
+#include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/basictypes.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;
 
 namespace appcache {
 
 class AppCache;
 class AppCacheEntry;
 class AppCacheGroup;
 class AppCacheResponseReader;
 class AppCacheResponseWriter;
 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) {}
 
     // If a load fails the 'cache' will be NULL.
     virtual void OnCacheLoaded(AppCache* cache, int64 cache_id) {}
 
     // If a load fails the 'group' will be NULL.
     virtual void OnGroupLoaded(
         AppCacheGroup* group, const GURL& manifest_url) {}
@@ skipping 265 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(AppCacheStorageTest, DelegateReferences);
   FRIEND_TEST_ALL_PREFIXES(AppCacheStorageTest, UsageMap);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheStorage);
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_APPCACHE_STORAGE_H_