Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(282)

Unified Diff: webkit/tools/test_shell/simple_resource_loader_bridge.cc

Issue 4303003: Get rid of a dependency on MessageLoop::DestructionObserver.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/test_shell/simple_appcache_system.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/simple_resource_loader_bridge.cc
===================================================================
--- webkit/tools/test_shell/simple_resource_loader_bridge.cc (revision 65856)
+++ webkit/tools/test_shell/simple_resource_loader_bridge.cc (working copy)
@@ -109,7 +109,7 @@
}
TestShellRequestContextParams* g_request_context_params = NULL;
-URLRequestContext* g_request_context = NULL;
+TestShellRequestContext* g_request_context = NULL;
base::Thread* g_cache_thread = NULL;
//-----------------------------------------------------------------------------
@@ -144,17 +144,19 @@
SimpleAppCacheSystem::InitializeOnIOThread(g_request_context);
SimpleSocketStreamBridge::InitializeOnIOThread(g_request_context);
SimpleFileWriter::InitializeOnIOThread(g_request_context);
+ TestShellWebBlobRegistryImpl::InitializeOnIOThread(
+ g_request_context->blob_storage_controller());
- TestShellWebBlobRegistryImpl::InitializeOnIOThread(
- static_cast<TestShellRequestContext*>(g_request_context)->
- blob_storage_controller());
URLRequest::RegisterProtocolFactory("blob", &BlobURLRequestJobFactory);
}
virtual void CleanUp() {
- SimpleSocketStreamBridge::Cleanup();
+ // In reverse order of initialization.
TestShellWebBlobRegistryImpl::Cleanup();
SimpleFileWriter::CleanupOnIOThread();
+ SimpleSocketStreamBridge::Cleanup();
+ SimpleAppCacheSystem::CleanupOnIOThread();
+
if (g_request_context) {
g_request_context->Release();
g_request_context = NULL;
« no previous file with comments | « webkit/tools/test_shell/simple_appcache_system.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698