summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/simple_appcache_system.h
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-29 03:37:22 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-29 03:37:22 +0000
commit833a4baa2ccf968616d72361a74852c57f911d96 (patch)
tree07ccc3df12e7800ef381dd14ca2bda4e8760aa81 /webkit/tools/test_shell/simple_appcache_system.h
parent5ac84ca4f92eea80f31b5c7a58e41e35657a69ab (diff)
downloadchromium_src-833a4baa2ccf968616d72361a74852c57f911d96.zip
chromium_src-833a4baa2ccf968616d72361a74852c57f911d96.tar.gz
chromium_src-833a4baa2ccf968616d72361a74852c57f911d96.tar.bz2
Revert 35328 - AppCacheDatabase and SQL based AppCacheStorageImpl.
Still nothing is being written to disk with this CL, inmemory SQLite and DiskCaches are being utilized. Responses are not yet being removed from the DiskCasche when the should be. Once that's done (in the next CL), we'll start saving things on disk. BUG=none TEST=appcache_database_unittest.cc, appcache_storage_impl_unittest.cc Review URL: http://codereview.chromium.org/501033 TBR=michaeln@chromium.org Review URL: http://codereview.chromium.org/519018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35329 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/simple_appcache_system.h')
-rw-r--r--webkit/tools/test_shell/simple_appcache_system.h33
1 files changed, 4 insertions, 29 deletions
diff --git a/webkit/tools/test_shell/simple_appcache_system.h b/webkit/tools/test_shell/simple_appcache_system.h
index 0ea465a..adeedd6 100644
--- a/webkit/tools/test_shell/simple_appcache_system.h
+++ b/webkit/tools/test_shell/simple_appcache_system.h
@@ -73,38 +73,16 @@ class SimpleAppCacheSystem : public MessageLoop::DestructionObserver {
instance_->GetExtraResponseBits(request, cache_id, manifest_url);
}
- // Some unittests create their own IO and DB threads.
+ private:
+ friend class SimpleBackendProxy;
+ friend class SimpleFrontendProxy;
+ friend class appcache::AppCacheThread;
enum AppCacheThreadID {
DB_THREAD_ID,
IO_THREAD_ID,
};
- class ThreadProvider {
- public:
- virtual ~ThreadProvider() {}
- virtual bool PostTask(
- int id,
- const tracked_objects::Location& from_here,
- Task* task) = 0;
- virtual bool CurrentlyOn(int id) = 0;
- };
-
- static void set_thread_provider(ThreadProvider* provider) {
- DCHECK(instance_);
- DCHECK(!provider || !instance_->thread_provider_);
- instance_->thread_provider_ = provider;
- }
-
- static ThreadProvider* thread_provider() {
- return instance_ ? instance_->thread_provider_ : NULL;
- }
-
- private:
- friend class SimpleBackendProxy;
- friend class SimpleFrontendProxy;
- friend class appcache::AppCacheThread;
-
// Instance methods called by our static public methods
void InitOnUIThread(const FilePath& cache_directory);
void InitOnIOThread(URLRequestContext* request_context);
@@ -158,9 +136,6 @@ class SimpleAppCacheSystem : public MessageLoop::DestructionObserver {
// We start a thread for use as the DB thread.
base::Thread db_thread_;
- // Some unittests create there own IO and DB threads.
- ThreadProvider* thread_provider_;
-
// A low-tech singleton.
static SimpleAppCacheSystem* instance_;
};