summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-23 18:38:56 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-23 18:38:56 +0000
commit5121092d714ba4764274162c33cc5029cd6b08ef (patch)
treedd7edfda91878958bcd83d14d7f16daba6ad403e /chrome/browser
parent858ca6df849d00092a70e012e7ae2e58dd787be3 (diff)
downloadchromium_src-5121092d714ba4764274162c33cc5029cd6b08ef.zip
chromium_src-5121092d714ba4764274162c33cc5029cd6b08ef.tar.gz
chromium_src-5121092d714ba4764274162c33cc5029cd6b08ef.tar.bz2
Be sure to initialize AppCacheDispatcherHost on the IO thread.
TEST=none BUG=none Review URL: http://codereview.chromium.org/221002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26955 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/renderer_host/resource_message_filter.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index 60f6bf6..3313c6c 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -194,8 +194,8 @@ ResourceMessageFilter::~ResourceMessageFilter() {
}
void ResourceMessageFilter::Init() {
+ DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
render_widget_helper_->Init(id(), resource_dispatcher_host_);
- appcache_dispatcher_host_->Initialize(this, id());
}
// Called on the IPC thread:
@@ -212,6 +212,8 @@ void ResourceMessageFilter::OnFilterAdded(IPC::Channel* channel) {
// Called on the IPC thread:
void ResourceMessageFilter::OnChannelConnected(int32 peer_pid) {
DCHECK(!handle()) << " " << handle();
+ DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
+
base::ProcessHandle peer_handle;
if (!base::OpenProcessHandle(peer_pid, &peer_handle)) {
NOTREACHED();
@@ -224,6 +226,8 @@ void ResourceMessageFilter::OnChannelConnected(int32 peer_pid) {
WorkerService::GetInstance()->Initialize(
resource_dispatcher_host_, ui_loop());
+
+ appcache_dispatcher_host_->Initialize(this, id());
}
void ResourceMessageFilter::OnChannelError() {