| Index: content/browser/service_worker/service_worker_disk_cache.h
|
| diff --git a/content/browser/service_worker/service_worker_disk_cache.h b/content/browser/service_worker/service_worker_disk_cache.h
|
| index 83850129aad0fcd7491d0b8296cade930bca288a..7fa51eed6348d5850143d9342d02e942a6d0e06d 100644
|
| --- a/content/browser/service_worker/service_worker_disk_cache.h
|
| +++ b/content/browser/service_worker/service_worker_disk_cache.h
|
| @@ -5,8 +5,8 @@
|
| #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DISK_CACHE_H_
|
| #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DISK_CACHE_H_
|
|
|
| +#include "content/browser/appcache/appcache_disk_cache.h"
|
| #include "content/common/content_export.h"
|
| -#include "webkit/browser/appcache/appcache_disk_cache.h"
|
|
|
| namespace content {
|
|
|
| @@ -17,11 +17,11 @@ namespace content {
|
| // resused classes to a more common location.
|
|
|
| class CONTENT_EXPORT ServiceWorkerDiskCache
|
| - : public appcache::AppCacheDiskCache {
|
| + : public AppCacheDiskCache {
|
| };
|
|
|
| class CONTENT_EXPORT ServiceWorkerResponseReader
|
| - : public appcache::AppCacheResponseReader {
|
| + : public AppCacheResponseReader {
|
| protected:
|
| // Should only be constructed by the storage class.
|
| friend class ServiceWorkerStorage;
|
| @@ -31,7 +31,7 @@ class CONTENT_EXPORT ServiceWorkerResponseReader
|
| };
|
|
|
| class CONTENT_EXPORT ServiceWorkerResponseWriter
|
| - : public appcache::AppCacheResponseWriter {
|
| + : public AppCacheResponseWriter {
|
| protected:
|
| // Should only be constructed by the storage class.
|
| friend class ServiceWorkerStorage;
|
| @@ -40,16 +40,6 @@ class CONTENT_EXPORT ServiceWorkerResponseWriter
|
| ServiceWorkerDiskCache* disk_cache);
|
| };
|
|
|
| -struct CONTENT_EXPORT HttpResponseInfoIOBuffer
|
| - : public appcache::HttpResponseInfoIOBuffer {
|
| - public:
|
| - HttpResponseInfoIOBuffer() : appcache::HttpResponseInfoIOBuffer() {}
|
| - explicit HttpResponseInfoIOBuffer(net::HttpResponseInfo* info)
|
| - : appcache::HttpResponseInfoIOBuffer(info) {}
|
| - protected:
|
| - virtual ~HttpResponseInfoIOBuffer();
|
| -};
|
| -
|
| } // namespace content
|
|
|
| #endif // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DISK_CACHE_H_
|
|
|