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

webkit/appcache/appcache_interceptor.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_INTERCEPTOR_H_
 #define WEBKIT_APPCACHE_APPCACHE_INTERCEPTOR_H_
 
 #include "base/memory/singleton.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/glue/resource_type.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
 
 class AppCacheRequestHandler;
 class AppCacheService;
 
 // An interceptor to hijack requests and potentially service them out of
 // the appcache.
-class APPCACHE_EXPORT AppCacheInterceptor
+class WEBKIT_STORAGE_EXPORT AppCacheInterceptor
     : public net::URLRequest::Interceptor {
  public:
   // Registers a singleton instance with the net library.
   // Should be called early in the IO thread prior to initiating requests.
   static void EnsureRegistered() {
     CHECK(GetInstance());
   }
 
   // Must be called to make a request eligible for retrieval from an appcache.
   static void SetExtraRequestInfo(net::URLRequest* request,
@@ skipping 32 matching lines @@
   static void SetHandler(net::URLRequest* request,
                          AppCacheRequestHandler* handler);
   static AppCacheRequestHandler* GetHandler(net::URLRequest* request);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheInterceptor);
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_APPCACHE_INTERCEPTOR_H_