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

webkit/appcache/appcache_group.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_GROUP_H_
 #define WEBKIT_APPCACHE_APPCACHE_GROUP_H_
 
 #include <map>
 #include <vector>
 
 #include "base/cancelable_callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/appcache/appcache_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
 
 class AppCache;
 class AppCacheHost;
 class AppCacheService;
 class AppCacheUpdateJob;
 class HostObserver;
 
 // Collection of application caches identified by the same manifest URL.
 // A group exists as long as it is in use by a host or is being updated.
-class APPCACHE_EXPORT AppCacheGroup : public base::RefCounted<AppCacheGroup> {
+class WEBKIT_STORAGE_EXPORT AppCacheGroup
+    : public base::RefCounted<AppCacheGroup> {
  public:
 
-  class APPCACHE_EXPORT UpdateObserver {
+  class WEBKIT_STORAGE_EXPORT UpdateObserver {
     public:
       // Called just after an appcache update has completed.
       virtual void OnUpdateComplete(AppCacheGroup* group) = 0;
       virtual ~UpdateObserver() {}
   };
 
   enum UpdateStatus {
     IDLE,
     CHECKING,
     DOWNLOADING,
@@ skipping 113 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(AppCacheGroupTest, QueueUpdate);
   FRIEND_TEST_ALL_PREFIXES(AppCacheUpdateJobTest, AlreadyChecking);
   FRIEND_TEST_ALL_PREFIXES(AppCacheUpdateJobTest, AlreadyDownloading);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheGroup);
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_APPCACHE_GROUP_H_