Remove RDH from UtilityProcessHost.

chrome/browser/web_resource/web_resource_service.cc

 // 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.
 
 #include "chrome/browser/web_resource/web_resource_service.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 105 matching lines @@
  public:
   UnpackerClient(WebResourceService* web_resource_service,
                  const std::string& json_data)
     : web_resource_service_(web_resource_service),
       json_data_(json_data), got_response_(false) {
   }
 
   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 =
         web_resource_service_->resource_dispatcher_host_ != NULL &&
         !CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
     if (use_utility_process) {
       BrowserThread::ID thread_id;
       CHECK(BrowserThread::GetCurrentThreadIdentifier(&thread_id));
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           NewRunnableMethod(this, &UnpackerClient::StartProcessOnIOThread,
-                            web_resource_service_->resource_dispatcher_host_,
                             thread_id));
     } else {
       WebResourceUnpacker unpacker(json_data_);
       if (unpacker.Run()) {
         OnUnpackWebResourceSucceeded(*unpacker.parsed_json());
       } else {
         OnUnpackWebResourceFailed(unpacker.error_message());
       }
     }
   }
@@ skipping 23 matching lines @@
 
   // Release reference and set got_response_.
   void Cleanup() {
     if (got_response_)
       return;
 
     got_response_ = true;
     Release();
   }
 
-  void StartProcessOnIOThread(ResourceDispatcherHost* rdh,
-                              BrowserThread::ID thread_id) {
-    UtilityProcessHost* host = new UtilityProcessHost(rdh, this, thread_id);
+  void StartProcessOnIOThread(BrowserThread::ID thread_id) {
+    UtilityProcessHost* host = new UtilityProcessHost(this, thread_id);
     // TODO(mrc): get proper file path when we start using web resources
     // that need to be unpacked.
     host->StartWebResourceUnpacker(json_data_);
   }
 
   scoped_refptr<WebResourceService> web_resource_service_;
 
   // Holds raw JSON string.
   const std::string& json_data_;
 
@@ skipping 87 matching lines @@
 }
 
 void WebResourceService::UpdateResourceCache(const std::string& json_data) {
   UnpackerClient* client = new UnpackerClient(this, json_data);
   client->Start();
 
   // Set cache update time in preferences.
   prefs_->SetString(last_update_time_pref_name_,
       base::DoubleToString(base::Time::Now().ToDoubleT()));
 }