Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / browser / appcache / chrome_appcache_service.h

diff --git a/src/content/browser/appcache/chrome_appcache_service.h b/src/content/browser/appcache/chrome_appcache_service.h
index 61eafc1..d0422dd 100644 (file)
--- a/src/content/browser/appcache/chrome_appcache_service.h
+++ b/src/content/browser/appcache/chrome_appcache_service.h
@@ -8,10 +8,10 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/sequenced_task_runner_helpers.h"
+#include "content/browser/appcache/appcache_policy.h"
+#include "content/browser/appcache/appcache_service_impl.h"
 #include "content/common/content_export.h"
-#include "webkit/browser/appcache/appcache_policy.h"
-#include "webkit/browser/appcache/appcache_service.h"
-#include "webkit/browser/quota/special_storage_policy.h"
+#include "storage/browser/quota/special_storage_policy.h"
 
 namespace base {
 class FilePath;
@@ -26,7 +26,7 @@ class ResourceContext;
 
 struct ChromeAppCacheServiceDeleter;
 
-// An AppCacheService subclass used by the chrome. There is an instance
+// An AppCacheServiceImpl subclass used by the chrome. There is an instance
 // associated with each BrowserContext. This derivation adds refcounting
 // semantics since a browser context has multiple URLRequestContexts which refer
 // to the same object, and those URLRequestContexts are refcounted independently
@@ -35,22 +35,22 @@ struct ChromeAppCacheServiceDeleter;
 // All methods, except the ctor, are expected to be called on
 // the IO thread (unless specifically called out in doc comments).
 //
-// TODO(dpranke): Fix dependencies on AppCacheService so that we don't have
-// to worry about clients calling AppCacheService methods.
+// TODO(dpranke): Fix dependencies on AppCacheServiceImpl so that we don't have
+// to worry about clients calling AppCacheServiceImpl methods.
 class CONTENT_EXPORT ChromeAppCacheService
     : public base::RefCountedThreadSafe<ChromeAppCacheService,
                                         ChromeAppCacheServiceDeleter>,
-      NON_EXPORTED_BASE(public appcache::AppCacheService),
-      NON_EXPORTED_BASE(public appcache::AppCachePolicy) {
+      NON_EXPORTED_BASE(public AppCacheServiceImpl),
+      NON_EXPORTED_BASE(public AppCachePolicy) {
  public:
-  explicit ChromeAppCacheService(quota::QuotaManagerProxy* proxy);
+  explicit ChromeAppCacheService(storage::QuotaManagerProxy* proxy);
 
   // If |cache_path| is empty we will use in-memory structs.
   void InitializeOnIOThread(
       const base::FilePath& cache_path,
       ResourceContext* resource_context,
       net::URLRequestContextGetter* request_context_getter,
-      scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy);
+      scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy);
 
   // AppCachePolicy overrides
   virtual bool CanLoadAppCache(const GURL& manifest_url,