| Index: content/browser/in_process_webkit/indexed_db_key_utility_client.cc
|
| diff --git a/content/browser/in_process_webkit/indexed_db_key_utility_client.cc b/content/browser/in_process_webkit/indexed_db_key_utility_client.cc
|
| index d3e0300289c74aa8c91102dde361b0cb6dee2989..d995334b5d795aeb29ca1fd9d04f9e3e8e7fe97d 100644
|
| --- a/content/browser/in_process_webkit/indexed_db_key_utility_client.cc
|
| +++ b/content/browser/in_process_webkit/indexed_db_key_utility_client.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2009 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 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.
|
|
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "base/lazy_instance.h"
|
| #include "base/synchronization/waitable_event.h"
|
| -#include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/utility_process_host.h"
|
| #include "content/common/indexed_db_key.h"
|
| #include "content/common/serialized_script_value.h"
|
| @@ -62,7 +61,7 @@ class KeyUtilityClientImpl
|
| ~KeyUtilityClientImpl();
|
|
|
| void GetRDHAndStartUtilityProcess();
|
| - void StartUtilityProcessInternal(ResourceDispatcherHost* rdh);
|
| + void StartUtilityProcessInternal();
|
| void EndUtilityProcessInternal();
|
| void CallStartIDBKeyFromValueAndKeyPathFromIOThread(
|
| const std::vector<SerializedScriptValue>& values,
|
| @@ -252,12 +251,10 @@ void KeyUtilityClientImpl::GetRDHAndStartUtilityProcess() {
|
| return;
|
| }
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| - StartUtilityProcessInternal(g_browser_process->resource_dispatcher_host());
|
| + StartUtilityProcessInternal();
|
| }
|
|
|
| -void KeyUtilityClientImpl::StartUtilityProcessInternal(
|
| - ResourceDispatcherHost* rdh) {
|
| - DCHECK(rdh);
|
| +void KeyUtilityClientImpl::StartUtilityProcessInternal() {
|
| // The ResourceDispatcherHost can only be used on the IO thread.
|
| if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| @@ -265,8 +262,7 @@ void KeyUtilityClientImpl::StartUtilityProcessInternal(
|
| BrowserThread::IO, FROM_HERE,
|
| NewRunnableMethod(
|
| this,
|
| - &KeyUtilityClientImpl::StartUtilityProcessInternal,
|
| - rdh));
|
| + &KeyUtilityClientImpl::StartUtilityProcessInternal));
|
| return;
|
| }
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| @@ -274,7 +270,7 @@ void KeyUtilityClientImpl::StartUtilityProcessInternal(
|
|
|
| client_ = new KeyUtilityClientImpl::Client(this);
|
| utility_process_host_ = new UtilityProcessHost(
|
| - rdh, client_.get(), BrowserThread::IO);
|
| + client_.get(), BrowserThread::IO);
|
| utility_process_host_->StartBatchMode();
|
| state_ = STATE_INITIALIZED;
|
| waitable_event_.Signal();
|
|
|