AppCache: Use a dedicated thread for the disk cache.

webkit/tools/test_shell/test_shell_request_context.cc

 // Copyright (c) 2010 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.
 
 #include "webkit/tools/test_shell/test_shell_request_context.h"
 
 #include "build/build_config.h"
 
 #include "base/file_path.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/host_resolver.h"
 #include "net/base/ssl_config_service.h"
 #include "net/base/static_cookie_policy.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_service.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 
-TestShellRequestContext::TestShellRequestContext() : cache_thread_("cache") {
+TestShellRequestContext::TestShellRequestContext() {
   Init(FilePath(), net::HttpCache::NORMAL, false);
 }
 
 TestShellRequestContext::TestShellRequestContext(
     const FilePath& cache_path,
     net::HttpCache::Mode cache_mode,
-    bool no_proxy) : cache_thread_("cache") {
+    bool no_proxy) {
   Init(cache_path, cache_mode, no_proxy);
 }
 
 void TestShellRequestContext::Init(
     const FilePath& cache_path,
     net::HttpCache::Mode cache_mode,
     bool no_proxy) {
   cookie_store_ = new net::CookieMonster(NULL, NULL);
   cookie_policy_ = new net::StaticCookiePolicy();
 
@@ skipping 17 matching lines @@
   scoped_ptr<net::ProxyConfigService> proxy_config_service(
       net::ProxyService::CreateSystemProxyConfigService(NULL, NULL));
 #endif
   host_resolver_ = net::CreateSystemHostResolver(NULL);
   proxy_service_ = net::ProxyService::Create(proxy_config_service.release(),
                                              false, NULL, NULL, NULL, NULL);
   ssl_config_service_ = net::SSLConfigService::CreateSystemSSLConfigService();
 
   http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault();
 
-  if (!cache_path.empty())
-    CHECK(cache_thread_.StartWithOptions(
-              base::Thread::Options(MessageLoop::TYPE_IO, 0)));
-
   net::HttpCache::DefaultBackend* backend = new net::HttpCache::DefaultBackend(
       cache_path.empty() ? net::MEMORY_CACHE : net::DISK_CACHE,
-      cache_path, 0, cache_thread_.message_loop_proxy());
+      cache_path, 0, SimpleResourceLoaderBridge::GetCacheThread());
 
   net::HttpCache* cache =
       new net::HttpCache(NULL, host_resolver_, proxy_service_,
                          ssl_config_service_, http_auth_handler_factory_,
                          NULL, backend);
 
   cache->set_mode(cache_mode);
   http_transaction_factory_ = cache;
 
   ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_);
 }
 
 TestShellRequestContext::~TestShellRequestContext() {
   delete ftp_transaction_factory_;
   delete http_transaction_factory_;
   delete http_auth_handler_factory_;
   delete static_cast<net::StaticCookiePolicy*>(cookie_policy_);
 }
 
 const std::string& TestShellRequestContext::GetUserAgent(
     const GURL& url) const {
   return webkit_glue::GetUserAgent(url);
 }