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

webkit/appcache/appcache_url_request_job.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_URL_REQUEST_JOB_H_
 #define WEBKIT_APPCACHE_APPCACHE_URL_REQUEST_JOB_H_
 
 #include <string>
 
 #include "base/memory/weak_ptr.h"
 #include "net/http/http_byte_range.h"
 #include "net/url_request/url_request_job.h"
 #include "webkit/appcache/appcache_entry.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_response.h"
 #include "webkit/appcache/appcache_storage.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
 
 // A net::URLRequestJob derivative that knows how to return a response stored
 // in the appcache.
-class APPCACHE_EXPORT AppCacheURLRequestJob : public net::URLRequestJob,
-                                              public AppCacheStorage::Delegate {
+class WEBKIT_STORAGE_EXPORT AppCacheURLRequestJob
+    : public net::URLRequestJob,
+      public AppCacheStorage::Delegate {
  public:
   AppCacheURLRequestJob(net::URLRequest* request,
                         net::NetworkDelegate* network_delegate,
                         AppCacheStorage* storage);
 
   // Informs the job of what response it should deliver. Only one of these
   // methods should be called, and only once per job. A job will sit idle and
   // wait indefinitely until one of the deliver methods is called.
   void DeliverAppCachedResponse(const GURL& manifest_url, int64 group_id,
                                 int64 cache_id, const AppCacheEntry& entry,
@@ skipping 108 matching lines @@
   scoped_refptr<AppCacheResponseInfo> info_;
   net::HttpByteRange range_requested_;
   scoped_ptr<net::HttpResponseInfo> range_response_info_;
   scoped_ptr<AppCacheResponseReader> reader_;
   base::WeakPtrFactory<AppCacheURLRequestJob> weak_factory_;
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_APPCACHE_REQUEST_HANDLER_H_