Index: content/browser/appcache/appcache_update_job.h |
diff --git a/webkit/browser/appcache/appcache_update_job.h b/content/browser/appcache/appcache_update_job.h |
similarity index 93% |
rename from webkit/browser/appcache/appcache_update_job.h |
rename to content/browser/appcache/appcache_update_job.h |
index ba155411d52f8606ac6d1758f29e51acdfda4b70..14fc8316c4f6e062c64be6f0ebe590a0b56969da 100644 |
--- a/webkit/browser/appcache/appcache_update_job.h |
+++ b/content/browser/appcache/appcache_update_job.h |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_UPDATE_JOB_H_ |
-#define WEBKIT_BROWSER_APPCACHE_APPCACHE_UPDATE_JOB_H_ |
+#ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_UPDATE_JOB_H_ |
+#define CONTENT_BROWSER_APPCACHE_APPCACHE_UPDATE_JOB_H_ |
#include <deque> |
#include <map> |
@@ -14,17 +14,17 @@ |
#include "base/gtest_prod_util.h" |
#include "base/memory/ref_counted.h" |
#include "base/time/time.h" |
+#include "content/browser/appcache/appcache.h" |
+#include "content/browser/appcache/appcache_host.h" |
+#include "content/browser/appcache/appcache_response.h" |
+#include "content/browser/appcache/appcache_service_impl.h" |
+#include "content/browser/appcache/appcache_storage.h" |
+#include "content/common/appcache_interfaces.h" |
+#include "content/common/content_export.h" |
#include "net/base/completion_callback.h" |
#include "net/http/http_response_headers.h" |
#include "net/url_request/url_request.h" |
#include "url/gurl.h" |
-#include "webkit/browser/appcache/appcache.h" |
-#include "webkit/browser/appcache/appcache_host.h" |
-#include "webkit/browser/appcache/appcache_response.h" |
-#include "webkit/browser/appcache/appcache_service_impl.h" |
-#include "webkit/browser/appcache/appcache_storage.h" |
-#include "webkit/browser/webkit_storage_browser_export.h" |
-#include "webkit/common/appcache/appcache_interfaces.h" |
namespace content { |
FORWARD_DECLARE_TEST(AppCacheGroupTest, QueueUpdate); |
@@ -32,20 +32,20 @@ class AppCacheGroupTest; |
class AppCacheUpdateJobTest; |
} |
-namespace appcache { |
+namespace content { |
class HostNotifier; |
// Application cache Update algorithm and state. |
-class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheUpdateJob |
+class CONTENT_EXPORT AppCacheUpdateJob |
: public AppCacheStorage::Delegate, |
public AppCacheHost::Observer, |
public AppCacheServiceImpl::Observer { |
public: |
// Used for uma stats only for now, so new values are append only. |
enum ResultType { |
- UPDATE_OK, DB_ERROR, DISKCACHE_ERROR, APPCACHE_QUOTA_ERROR, REDIRECT_ERROR, |
- APPCACHE_MANIFEST_ERROR, NETWORK_ERROR, SERVER_ERROR, CANCELLED_ERROR, |
+ UPDATE_OK, DB_ERROR, DISKCACHE_ERROR, QUOTA_ERROR, REDIRECT_ERROR, |
+ MANIFEST_ERROR, NETWORK_ERROR, SERVER_ERROR, CANCELLED_ERROR, |
NUM_UPDATE_JOB_RESULT_TYPES |
}; |
@@ -347,6 +347,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheUpdateJob |
DISALLOW_COPY_AND_ASSIGN(AppCacheUpdateJob); |
}; |
-} // namespace appcache |
+} // namespace content |
-#endif // WEBKIT_BROWSER_APPCACHE_APPCACHE_UPDATE_JOB_H_ |
+#endif // CONTENT_BROWSER_APPCACHE_APPCACHE_UPDATE_JOB_H_ |