Get rid of a dependency on MessageLoop::DestructionObserver....

webkit/tools/test_shell/simple_resource_loader_bridge.cc

 // Copyright (c) 2006-2008 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.
 //
 // This file contains an implementation of the ResourceLoaderBridge class.
 // The class is implemented using URLRequest, meaning it is a "simple" version
 // that directly issues requests. The more complicated one used in the
 // browser uses IPC.
 //
 // Because URLRequest only provides an asynchronous resource loading API, this
@@ skipping 91 matching lines @@
   webkit_blob::BlobStorageController* blob_storage_controller =
       static_cast<TestShellRequestContext*>(request->context())->
           blob_storage_controller();
   return new webkit_blob::BlobURLRequestJob(
       request,
       blob_storage_controller->GetBlobDataFromUrl(request->url()),
       NULL);
 }
 
 TestShellRequestContextParams* g_request_context_params = NULL;
-URLRequestContext* g_request_context = NULL;
+TestShellRequestContext* g_request_context = NULL;
 base::Thread* g_cache_thread = NULL;
 
 //-----------------------------------------------------------------------------
 
 class IOThread : public base::Thread {
  public:
   IOThread() : base::Thread("IOThread") {
   }
 
   ~IOThread() {
@@ skipping 14 matching lines @@
     } else {
       g_request_context = new TestShellRequestContext();
       SetAcceptAllCookies(false);
     }
 
     g_request_context->AddRef();
 
     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;
     }
   }
 
   void SetAcceptAllCookies(bool accept_all_cookies) {
     StaticCookiePolicy::Type policy_type = accept_all_cookies ?
         StaticCookiePolicy::ALLOW_ALL_COOKIES :
         StaticCookiePolicy::BLOCK_THIRD_PARTY_COOKIES;
@@ skipping 758 matching lines @@
 
 // static
 scoped_refptr<base::MessageLoopProxy>
     SimpleResourceLoaderBridge::GetIoThread() {
   if (!EnsureIOThread()) {
     LOG(DFATAL) << "Failed to create IO thread.";
     return NULL;
   }
   return g_io_thread->message_loop_proxy();
 }