Fix for crash when deleting DataSource's in IO thread.

chrome/browser/dom_ui/chrome_url_data_manager.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 "chrome/browser/dom_ui/chrome_url_data_manager.h"
 
 #include "app/l10n_util.h"
+  #include "base/debug/stack_trace.h"

[eroman, 2011/01/19 22:47:01]

Is this intentional? Please remove.

[ahendrickson, 2011/01/21 16:04:31]

Cleanup fail.

Removed.

 #include "base/file_util.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/ref_counted_memory.h"
 #include "base/singleton.h"
+#include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 #include "chrome/browser/appcache/view_appcache_internals_job_factory.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/dom_ui/shared_resources_data_source.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
@@ skipping 155 matching lines @@
 ChromeURLDataManager::~ChromeURLDataManager() { }
 
 // static
 ChromeURLDataManager* ChromeURLDataManager::GetInstance() {
   return Singleton<ChromeURLDataManager>::get();
 }
 
 void ChromeURLDataManager::AddDataSource(scoped_refptr<DataSource> source) {
   // TODO(jackson): A new data source with same name should not clobber the
   // existing one.
+  if (ContainsKey(data_sources_, source->source_name())) {
+    // Some |DataSource| derived classes contain |CancellationFlag| members,
+    // which DCHECK if they are deleted in a different thread than they are
+    // created in.  This is the IO thread, so we can't delete it here (for
+    // example, by reassigning a |data_sources_| entry).
+    // Create another reference and post a call to the UI thread to delete it.
+    // Any classes that weren't created on the UI thread are thread safe,
+    // and won't care if they're deleted on another thread.
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE,
+        NewRunnableMethod(
+            ChromeURLDataManager::GetInstance(),
+            &ChromeURLDataManager::ReleaseDataSource,
+            source));
+  }
   data_sources_[source->source_name()] = source;
 }
 
+void ChromeURLDataManager::ReleaseDataSource(scoped_refptr<DataSource> source) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  source.release();
+}
+
 void ChromeURLDataManager::AddFileSource(const std::string& source_name,
                                          const FilePath& file_path) {
   DCHECK(file_sources_.count(source_name) == 0);
   file_sources_[source_name] = file_path;
 }
 
 void ChromeURLDataManager::RemoveFileSource(const std::string& source_name) {
   DCHECK(file_sources_.count(source_name) == 1);
   file_sources_.erase(source_name);
 }
@@ skipping 229 matching lines @@
                                       net::ERR_INVALID_URL));
   }
 }
 
 URLRequestChromeFileJob::URLRequestChromeFileJob(net::URLRequest* request,
                                                  const FilePath& path)
     : net::URLRequestFileJob(request, path) {
 }
 
 URLRequestChromeFileJob::~URLRequestChromeFileJob() { }