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

webkit/appcache/manifest_parser.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.
 //
 // This is a port of ManifestParser.h from WebKit/WebCore/loader/appcache.
 
 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ skipping 18 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WEBKIT_APPCACHE_MANIFEST_PARSER_H_
 #define WEBKIT_APPCACHE_MANIFEST_PARSER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/hash_tables.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_interfaces.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 class GURL;
 
 namespace appcache {
 
-struct APPCACHE_EXPORT Manifest {
+struct WEBKIT_STORAGE_EXPORT Manifest {
   Manifest();
   ~Manifest();
 
   base::hash_set<std::string> explicit_urls;
   NamespaceVector intercept_namespaces;
   NamespaceVector fallback_namespaces;
   std::vector<GURL> online_whitelist_namespaces;
   bool online_whitelist_all;
 };
 
-APPCACHE_EXPORT bool ParseManifest(const GURL& manifest_url,
-                                   const char* data,
-                                   int length,
-                                   Manifest& manifest);
+WEBKIT_STORAGE_EXPORT bool ParseManifest(const GURL& manifest_url,
+                                         const char* data,
+                                         int length,
+                                         Manifest& manifest);
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_MANIFEST_PARSER_H_