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

webkit/appcache/appcache_request_handler.h

 // Copyright (c) 2011 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_REQUEST_HANDLER_H_
 #define WEBKIT_APPCACHE_APPCACHE_REQUEST_HANDLER_H_
 
 #include "base/compiler_specific.h"
 #include "base/supports_user_data.h"
 #include "webkit/appcache/appcache_entry.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_host.h"
 #include "webkit/glue/resource_type.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace net {
 class NetworkDelegate;
 class URLRequest;
 class URLRequestJob;
 }  // namespace net
 
 namespace appcache {
 
 class AppCacheURLRequestJob;
 
 // An instance is created for each net::URLRequest. The instance survives all
 // http transactions involved in the processing of its net::URLRequest, and is
 // given the opportunity to hijack the request along the way. Callers
 // should use AppCacheHost::CreateRequestHandler to manufacture instances
 // that can retrieve resources for a particular host.
-class APPCACHE_EXPORT AppCacheRequestHandler
+class WEBKIT_STORAGE_EXPORT AppCacheRequestHandler
     : public base::SupportsUserData::Data,
       public AppCacheHost::Observer,
       public AppCacheStorage::Delegate  {
  public:
   virtual ~AppCacheRequestHandler();
 
   // These are called on each request intercept opportunity.
   AppCacheURLRequestJob* MaybeLoadResource(
       net::URLRequest* request, net::NetworkDelegate* network_delegate);
   AppCacheURLRequestJob* MaybeLoadFallbackForRedirect(
@@ skipping 90 matching lines @@
   // The job we use to deliver a response.
   scoped_refptr<AppCacheURLRequestJob> job_;
 
   friend class AppCacheRequestHandlerTest;
   DISALLOW_COPY_AND_ASSIGN(AppCacheRequestHandler);
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_APPCACHE_REQUEST_HANDLER_H_