| 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;
|
|
|