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

webkit/appcache/appcache_disk_cache.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_DISK_CACHE_H_
 #define WEBKIT_APPCACHE_APPCACHE_DISK_CACHE_H_
 
 #include <set>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "net/disk_cache/disk_cache.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_response.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
 
 // An implementation of AppCacheDiskCacheInterface that
 // uses net::DiskCache as the backing store.
-class APPCACHE_EXPORT AppCacheDiskCache
+class WEBKIT_STORAGE_EXPORT AppCacheDiskCache
     : public AppCacheDiskCacheInterface {
  public:
   AppCacheDiskCache();
   virtual ~AppCacheDiskCache();
 
   // Initializes the object to use disk backed storage.
   int InitWithDiskBackend(const FilePath& disk_cache_directory,
                           int disk_cache_size, bool force,
                           base::MessageLoopProxy* cache_thread,
                           const net::CompletionCallback& callback);
@@ skipping 60 matching lines @@
   net::CompletionCallback init_callback_;
   scoped_refptr<CreateBackendCallbackShim> create_backend_callback_;
   PendingCalls pending_calls_;
   ActiveCalls active_calls_;
   scoped_ptr<disk_cache::Backend> disk_cache_;
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_APPCACHE_DISK_CACHE_H_