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

webkit/appcache/appcache.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_H_
 #define WEBKIT_APPCACHE_APPCACHE_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/appcache/appcache_database.h"
 #include "webkit/appcache/appcache_entry.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/manifest_parser.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
 
 class AppCacheGroup;
 class AppCacheHost;
 class AppCacheService;
 
 // Set of cached resources for an application. A cache exists as long as a
 // host is associated with it, the cache is in an appcache group or the
 // cache is being created during an appcache upate.
-class APPCACHE_EXPORT AppCache : public base::RefCounted<AppCache> {
+class WEBKIT_STORAGE_EXPORT AppCache : public base::RefCounted<AppCache> {
  public:
   typedef std::map<GURL, AppCacheEntry> EntryMap;
   typedef std::set<AppCacheHost*> AppCacheHosts;
 
   AppCache(AppCacheService *service, int64 cache_id);
 
   int64 cache_id() const { return cache_id_; }
 
   AppCacheGroup* owning_group() const { return owning_group_; }
 
@@ skipping 135 matching lines @@
   AppCacheService* service_;
 
   FRIEND_TEST_ALL_PREFIXES(AppCacheTest, InitializeWithManifest);
   FRIEND_TEST_ALL_PREFIXES(AppCacheTest, ToFromDatabaseRecords);
   DISALLOW_COPY_AND_ASSIGN(AppCache);
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_APPCACHE_H_