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

webkit/appcache/appcache_update_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_UPDATE_JOB_H_
 #define WEBKIT_APPCACHE_APPCACHE_UPDATE_JOB_H_
 
 #include <deque>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/completion_callback.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "webkit/appcache/appcache.h"
-#include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_host.h"
 #include "webkit/appcache/appcache_interfaces.h"
 #include "webkit/appcache/appcache_response.h"
 #include "webkit/appcache/appcache_storage.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace appcache {
 
 class HostNotifier;
 
 // Application cache Update algorithm and state.
-class APPCACHE_EXPORT AppCacheUpdateJob : public AppCacheStorage::Delegate,
-                                          public AppCacheHost::Observer {
+class WEBKIT_STORAGE_EXPORT AppCacheUpdateJob
+    : public AppCacheStorage::Delegate,
+      public AppCacheHost::Observer {
  public:
   AppCacheUpdateJob(AppCacheService* service, AppCacheGroup* group);
   virtual ~AppCacheUpdateJob();
 
   // Triggers the update process or adds more info if this update is already
   // in progress.
   void StartUpdate(AppCacheHost* host, const GURL& new_master_resource);
 
  private:
   friend class AppCacheUpdateJobTest;
@@ skipping 256 matching lines @@
   StoredState stored_state_;
 
   FRIEND_TEST_ALL_PREFIXES(AppCacheGroupTest, QueueUpdate);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheUpdateJob);
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_APPCACHE_UPDATE_JOB_H_