Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / test / appcache_test_helper.h

diff --git a/src/content/test/appcache_test_helper.h b/src/content/test/appcache_test_helper.h
index 184e427..5f5221f 100644 (file)
--- a/src/content/test/appcache_test_helper.h
+++ b/src/content/test/appcache_test_helper.h
@@ -7,37 +7,36 @@
 
 #include <set>
 
-#include "webkit/browser/appcache/appcache_storage.h"
+#include "content/browser/appcache/appcache_storage.h"
 
-namespace appcache {
-class AppCacheService;
+namespace content {
+class AppCacheServiceImpl;
 }
 
 namespace content {
 
 // Helper class for inserting data into a ChromeAppCacheService and reading it
 // back.
-class AppCacheTestHelper : public appcache::AppCacheStorage::Delegate {
+class AppCacheTestHelper : public AppCacheStorage::Delegate {
  public:
   AppCacheTestHelper();
-  virtual ~AppCacheTestHelper();
-  void AddGroupAndCache(appcache::AppCacheService* appcache_service,
+  ~AppCacheTestHelper() override;
+  void AddGroupAndCache(AppCacheServiceImpl* appcache_service,
                         const GURL& manifest_url);
 
-  void GetOriginsWithCaches(appcache::AppCacheService* appcache_service,
+  void GetOriginsWithCaches(AppCacheServiceImpl* appcache_service,
                             std::set<GURL>* origins);
  private:
-  virtual void OnGroupAndNewestCacheStored(
-      appcache::AppCacheGroup* group,
-      appcache::AppCache* newest_cache,
-      bool success,
-      bool would_exceed_quota) OVERRIDE;
+  void OnGroupAndNewestCacheStored(AppCacheGroup* group,
+                                   AppCache* newest_cache,
+                                   bool success,
+                                   bool would_exceed_quota) override;
   void OnGotAppCacheInfo(int rv);
 
   int group_id_;
   int appcache_id_;
   int response_id_;
-  scoped_refptr<appcache::AppCacheInfoCollection> appcache_info_;
+  scoped_refptr<AppCacheInfoCollection> appcache_info_;
   std::set<GURL>* origins_;  // not owned
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheTestHelper);