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

webkit/tools/test_shell/simple_appcache_system.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/simple_appcache_system.h"
 
 #include "base/callback.h"
 #include "base/lock.h"
 #include "base/task.h"
 #include "base/waitable_event.h"
@@ skipping 372 matching lines @@
   ui_message_loop_ = MessageLoop::current();
   cache_directory_ = cache_directory;
 }
 
 void SimpleAppCacheSystem::InitOnIOThread(URLRequestContext* request_context) {
   if (!is_initailized_on_ui_thread())
     return;
 
   DCHECK(!io_message_loop_);
   io_message_loop_ = MessageLoop::current();
-  io_message_loop_->AddDestructionObserver(this);
 
   if (!db_thread_.IsRunning())
     db_thread_.Start();
 
   // Recreate and initialize per each IO thread.
   service_ = new appcache::AppCacheService();
   backend_impl_ = new appcache::AppCacheBackendImpl();
   service_->Initialize(cache_directory_,
                        SimpleResourceLoaderBridge::GetCacheThread());
   service_->set_request_context(request_context);
   backend_impl_->Initialize(service_, frontend_proxy_.get(), kSingleProcessId);
 
   AppCacheInterceptor::EnsureRegistered();
 }
 
+void SimpleAppCacheSystem::CleanupIOThread() {
+  DCHECK(is_io_thread());
+
+  delete backend_impl_;
+  delete service_;
+  backend_impl_ = NULL;
+  service_ = NULL;
+  io_message_loop_ = NULL;
+
+  // Just in case the main thread is waiting on it.
+  backend_proxy_->SignalEvent();
+}
+
 WebApplicationCacheHost* SimpleAppCacheSystem::CreateCacheHostForWebKit(
     WebApplicationCacheHostClient* client) {
   if (!is_initailized_on_ui_thread())
     return NULL;
 
   DCHECK(is_ui_thread());
 
   // The IO thread needs to be running for this system to work.
   SimpleResourceLoaderBridge::EnsureIOThread();
 
@@ skipping 12 matching lines @@
 }
 
 void SimpleAppCacheSystem::GetExtraResponseBits(
     URLRequest* request, int64* cache_id, GURL* manifest_url) {
   if (is_initialized()) {
     DCHECK(is_io_thread());
     AppCacheInterceptor::GetExtraResponseInfo(
         request, cache_id, manifest_url);
   }
 }
-
-void SimpleAppCacheSystem::WillDestroyCurrentMessageLoop() {
-  DCHECK(is_io_thread());
-
-  delete backend_impl_;
-  delete service_;
-  backend_impl_ = NULL;
-  service_ = NULL;
-  io_message_loop_ = NULL;
-
-  // Just in case the main thread is waiting on it.
-  backend_proxy_->SignalEvent();
-}