Move all remaining appcache-related code to content namespace

webkit/browser/appcache/appcache_storage_impl.h

Index: webkit/browser/appcache/appcache_storage_impl.h
diff --git a/webkit/browser/appcache/appcache_storage_impl.h b/webkit/browser/appcache/appcache_storage_impl.h
deleted file mode 100644
index a5103a63619ece56013bae99020ab0d5448e7863..0000000000000000000000000000000000000000
--- a/webkit/browser/appcache/appcache_storage_impl.h
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright (c) 2011 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_BROWSER_APPCACHE_APPCACHE_STORAGE_IMPL_H_
-#define WEBKIT_BROWSER_APPCACHE_APPCACHE_STORAGE_IMPL_H_
-
-#include <deque>
-#include <map>
-#include <set>
-#include <utility>
-#include <vector>
-
-#include "base/callback.h"
-#include "base/files/file_path.h"
-#include "base/memory/weak_ptr.h"
-#include "base/message_loop/message_loop_proxy.h"
-#include "webkit/browser/appcache/appcache_database.h"
-#include "webkit/browser/appcache/appcache_disk_cache.h"
-#include "webkit/browser/appcache/appcache_storage.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
-
-namespace content {
-class AppCacheStorageImplTest;
-class ChromeAppCacheServiceTest;
-}
-
-namespace appcache {
-
-class AppCacheStorageImpl : public AppCacheStorage {
- public:
-  explicit AppCacheStorageImpl(AppCacheServiceImpl* service);
-  virtual ~AppCacheStorageImpl();
-
-  void Initialize(const base::FilePath& cache_directory,
-                  base::MessageLoopProxy* db_thread,
-                  base::MessageLoopProxy* cache_thread);
-  void Disable();
-  bool is_disabled() const { return is_disabled_; }
-
-  // AppCacheStorage methods, see the base class for doc comments.
-  virtual void GetAllInfo(Delegate* delegate) OVERRIDE;
-  virtual void LoadCache(int64 id, Delegate* delegate) OVERRIDE;
-  virtual void LoadOrCreateGroup(const GURL& manifest_url,
-                                 Delegate* delegate) OVERRIDE;
-  virtual void StoreGroupAndNewestCache(AppCacheGroup* group,
-                                        AppCache* newest_cache,
-                                        Delegate* delegate) OVERRIDE;
-  virtual void FindResponseForMainRequest(const GURL& url,
-                                          const GURL& preferred_manifest_url,
-                                          Delegate* delegate) OVERRIDE;
-  virtual void FindResponseForSubRequest(
-      AppCache* cache, const GURL& url,
-      AppCacheEntry* found_entry, AppCacheEntry* found_fallback_entry,
-      bool* found_network_namespace) OVERRIDE;
-  virtual void MarkEntryAsForeign(const GURL& entry_url,
-                                  int64 cache_id) OVERRIDE;
-  virtual void MakeGroupObsolete(AppCacheGroup* group,
-                                 Delegate* delegate,
-                                 int response_code) OVERRIDE;
-  virtual AppCacheResponseReader* CreateResponseReader(
-      const GURL& manifest_url, int64 group_id, int64 response_id) OVERRIDE;
-  virtual AppCacheResponseWriter* CreateResponseWriter(
-      const GURL& manifest_url, int64 group_id) OVERRIDE;
-  virtual void DoomResponses(const GURL& manifest_url,
-                             const std::vector<int64>& response_ids) OVERRIDE;
-  virtual void DeleteResponses(const GURL& manifest_url,
-                               const std::vector<int64>& response_ids) OVERRIDE;
-
- private:
-  // The AppCacheStorageImpl class methods and datamembers may only be
-  // accessed on the IO thread. This class manufactures seperate DatabaseTasks
-  // which access the DB on a seperate background thread.
-  class DatabaseTask;
-  class InitTask;
-  class DisableDatabaseTask;
-  class GetAllInfoTask;
-  class StoreOrLoadTask;
-  class CacheLoadTask;
-  class GroupLoadTask;
-  class StoreGroupAndCacheTask;
-  class FindMainResponseTask;
-  class MarkEntryAsForeignTask;
-  class MakeGroupObsoleteTask;
-  class GetDeletableResponseIdsTask;
-  class InsertDeletableResponseIdsTask;
-  class DeleteDeletableResponseIdsTask;
-  class UpdateGroupLastAccessTimeTask;
-
-  typedef std::deque<DatabaseTask*> DatabaseTaskQueue;
-  typedef std::map<int64, CacheLoadTask*> PendingCacheLoads;
-  typedef std::map<GURL, GroupLoadTask*> PendingGroupLoads;
-  typedef std::deque<std::pair<GURL, int64> > PendingForeignMarkings;
-  typedef std::set<StoreGroupAndCacheTask*> PendingQuotaQueries;
-
-  bool IsInitTaskComplete() {
-    return last_cache_id_ != AppCacheStorage::kUnitializedId;
-  }
-
-  CacheLoadTask* GetPendingCacheLoadTask(int64 cache_id);
-  GroupLoadTask* GetPendingGroupLoadTask(const GURL& manifest_url);
-  void GetPendingForeignMarkingsForCache(
-      int64 cache_id, std::vector<GURL>* urls);
-
-  void ScheduleSimpleTask(const base::Closure& task);
-  void RunOnePendingSimpleTask();
-
-  void DelayedStartDeletingUnusedResponses();
-  void StartDeletingResponses(const std::vector<int64>& response_ids);
-  void ScheduleDeleteOneResponse();
-  void DeleteOneResponse();
-
-  void OnDeletedOneResponse(int rv);
-  void OnDiskCacheInitialized(int rv);
-  void DeleteAndStartOver();
-  void DeleteAndStartOverPart2();
-  void CallScheduleReinitialize();
-
-  // Sometimes we can respond without having to query the database.
-  bool FindResponseForMainRequestInGroup(
-      AppCacheGroup* group,  const GURL& url, Delegate* delegate);
-  void DeliverShortCircuitedFindMainResponse(
-      const GURL& url,
-      const AppCacheEntry& found_entry,
-      scoped_refptr<AppCacheGroup> group,
-      scoped_refptr<AppCache> newest_cache,
-      scoped_refptr<DelegateReference> delegate_ref);
-
-  void CallOnMainResponseFound(
-      DelegateReferenceVector* delegates,
-      const GURL& url, const AppCacheEntry& entry,
-      const GURL& namespace_entry_url, const AppCacheEntry& fallback_entry,
-      int64 cache_id, int64 group_id, const GURL& manifest_url);
-
-  WEBKIT_STORAGE_BROWSER_EXPORT AppCacheDiskCache* disk_cache();
-
-  // The directory in which we place files in the file system.
-  base::FilePath cache_directory_;
-  bool is_incognito_;
-
-  // This class operates primarily on the IO thread, but schedules
-  // its DatabaseTasks on the db thread. Separately, the disk_cache uses
-  // the cache_thread.
-  scoped_refptr<base::MessageLoopProxy> db_thread_;
-  scoped_refptr<base::MessageLoopProxy> cache_thread_;
-
-  // Structures to keep track of DatabaseTasks that are in-flight.
-  DatabaseTaskQueue scheduled_database_tasks_;
-  PendingCacheLoads pending_cache_loads_;
-  PendingGroupLoads pending_group_loads_;
-  PendingForeignMarkings pending_foreign_markings_;
-  PendingQuotaQueries pending_quota_queries_;
-
-  // Structures to keep track of lazy response deletion.
-  std::deque<int64> deletable_response_ids_;
-  std::vector<int64> deleted_response_ids_;
-  bool is_response_deletion_scheduled_;
-  bool did_start_deleting_responses_;
-  int64 last_deletable_response_rowid_;
-
-  // Created on the IO thread, but only used on the DB thread.
-  AppCacheDatabase* database_;
-
-  // Set if we discover a fatal error like a corrupt SQL database or
-  // disk cache and cannot continue.
-  bool is_disabled_;
-
-  scoped_ptr<AppCacheDiskCache> disk_cache_;
-
-  // Used to short-circuit certain operations without having to schedule
-  // any tasks on the background database thread.
-  std::deque<base::Closure> pending_simple_tasks_;
-  base::WeakPtrFactory<AppCacheStorageImpl> weak_factory_;
-
-  friend class content::AppCacheStorageImplTest;
-  friend class content::ChromeAppCacheServiceTest;
-};
-
-}  // namespace appcache
-
-#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_STORAGE_IMPL_H_