Retrofit the pre-existing appache message dispatching with the new WebKit APIs and concrete classes defined in our new appcache library, and get rid of the old files.

There are many files in the CL, mostly to pickup constant values now defined in our new appcache library, and to reflect a terminilogy change (from 'context' to 'host').

TEST=some existing unit tests apply
BUG=none

Review URL: http://codereview.chromium.org/170003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24022 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 9 deletions

diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index ecddc2de2..b160bed 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -12,8 +12,7 @@
 #include "base/shared_memory.h"
 #include "base/stats_table.h"
 #include "base/thread_local.h"
-#include "chrome/common/app_cache/app_cache_context_impl.h"
-#include "chrome/common/app_cache/app_cache_dispatcher.h"
+#include "chrome/common/appcache/appcache_dispatcher.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/db_message_filter.h"
 #include "chrome/common/render_messages.h"
@@ -61,9 +60,6 @@ namespace {
 static const unsigned int kCacheStatsDelayMS = 2000 /* milliseconds */;
 static base::LazyInstance<base::ThreadLocalPointer<RenderThread> > lazy_tls(
     base::LINKER_INITIALIZED);
-static WebAppCacheContext* CreateAppCacheContextForRenderer() {
-  return new AppCacheContextImpl(RenderThread::current());
-}
 
 #if defined(OS_POSIX)
 class SuicideOnChannelErrorFilter : public IPC::ChannelProxy::MessageFilter {
@@ -116,8 +112,7 @@ void RenderThread::Init() {
   user_script_slave_.reset(new UserScriptSlave());
   dns_master_.reset(new RenderDnsMaster());
   histogram_snapshots_.reset(new RendererHistogramSnapshots());
-  app_cache_dispatcher_.reset(new AppCacheDispatcher());
-  WebAppCacheContext::SetFactory(CreateAppCacheContextForRenderer);
+  appcache_dispatcher_.reset(new AppCacheDispatcher(this));
   devtools_agent_filter_ = new DevToolsAgentFilter();
   AddFilter(devtools_agent_filter_.get());
   db_message_filter_ = new DBMessageFilter();
@@ -134,7 +129,6 @@ RenderThread::~RenderThread() {
   RemoveFilter(devtools_agent_filter_.get());
   RemoveFilter(db_message_filter_.get());
   db_message_filter_ = NULL;
-  WebAppCacheContext::SetFactory(NULL);
   if (webkit_client_.get())
     WebKit::shutdown();
 
@@ -210,7 +204,7 @@ void RenderThread::OnExtensionSetPermissions(
 
 void RenderThread::OnControlMessageReceived(const IPC::Message& msg) {
   // App cache messages are handled by a delegate.
-  if (app_cache_dispatcher_->OnMessageReceived(msg))
+  if (appcache_dispatcher_->OnMessageReceived(msg))
     return;
 
   IPC_BEGIN_MESSAGE_MAP(RenderThread, msg)