summaryrefslogtreecommitdiffstats
path: root/chrome/browser/web_resource
diff options
context:
space:
mode:
authorisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-06 22:02:57 +0000
committerisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-06 22:02:57 +0000
commit9cb31511cb8ba57c36157c5a509ffd3fe4568437 (patch)
tree3110acca212c5387d4e0965d371c7a3c207c6871 /chrome/browser/web_resource
parent06dbd0779f5a378f33d26526db0f9216c28ff35c (diff)
downloadchromium_src-9cb31511cb8ba57c36157c5a509ffd3fe4568437.zip
chromium_src-9cb31511cb8ba57c36157c5a509ffd3fe4568437.tar.gz
chromium_src-9cb31511cb8ba57c36157c5a509ffd3fe4568437.tar.bz2
Revert 80702 - Remove RDH from UtilityProcessHost.The utility process should not need to issue resource requests.BUG=78596TEST=noneReview URL: http://codereview.chromium.org/6805008
TBR=willchan@chromium.org Review URL: http://codereview.chromium.org/6805020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_resource')
-rw-r--r--chrome/browser/web_resource/web_resource_service.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc
index 1bd0393..717c850 100644
--- a/chrome/browser/web_resource/web_resource_service.cc
+++ b/chrome/browser/web_resource/web_resource_service.cc
@@ -123,8 +123,6 @@ class WebResourceService::UnpackerClient
void Start() {
AddRef(); // balanced in Cleanup.
- // TODO(willchan): Look for a better signal of whether we're in a unit test
- // or not. Using |resource_dispatcher_host_| for this is pretty lame.
// If we don't have a resource_dispatcher_host_, assume we're in
// a test and run the unpacker directly in-process.
bool use_utility_process =
@@ -136,6 +134,7 @@ class WebResourceService::UnpackerClient
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
NewRunnableMethod(this, &UnpackerClient::StartProcessOnIOThread,
+ web_resource_service_->resource_dispatcher_host_,
thread_id));
} else {
WebResourceUnpacker unpacker(json_data_);
@@ -179,8 +178,9 @@ class WebResourceService::UnpackerClient
Release();
}
- void StartProcessOnIOThread(BrowserThread::ID thread_id) {
- UtilityProcessHost* host = new UtilityProcessHost(this, thread_id);
+ void StartProcessOnIOThread(ResourceDispatcherHost* rdh,
+ BrowserThread::ID thread_id) {
+ UtilityProcessHost* host = new UtilityProcessHost(rdh, this, thread_id);
// TODO(mrc): get proper file path when we start using web resources
// that need to be unpacked.
host->StartWebResourceUnpacker(json_data_);