Remove RDH from UtilityProcessHost.

content/browser/in_process_webkit/indexed_db_key_utility_client.cc

-// 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.
 
 #include "content/browser/in_process_webkit/indexed_db_key_utility_client.h"
 
 #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"
 
 // This class is used to obtain IndexedDBKeys from SerializedScriptValues
 // given an IDBKeyPath. It uses UtilityProcess to do this inside a sandbox
 // (a V8 lock is required there). At this level, all methods are synchronous
 // as required by the caller. The public API is used on WEBKIT thread,
 // but internally it moves around to UI and IO as needed.
 class KeyUtilityClientImpl
@@ skipping 35 matching lines @@
    private:
     KeyUtilityClientImpl* parent_;
 
     DISALLOW_COPY_AND_ASSIGN(Client);
   };
 
   friend class base::RefCountedThreadSafe<KeyUtilityClientImpl>;
   ~KeyUtilityClientImpl();
 
   void GetRDHAndStartUtilityProcess();
-  void StartUtilityProcessInternal(ResourceDispatcherHost* rdh);
+  void StartUtilityProcessInternal();
   void EndUtilityProcessInternal();
   void CallStartIDBKeyFromValueAndKeyPathFromIOThread(
       const std::vector<SerializedScriptValue>& values,
       const string16& key_path);
   void CallStartInjectIDBKeyFromIOThread(
       const IndexedDBKey& key,
       const SerializedScriptValue& value,
       const string16& key_path);
 
   void SetKeys(const std::vector<IndexedDBKey>& keys);
@@ skipping 169 matching lines @@
   // browser_process.h
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         NewRunnableMethod(
             this,
             &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));
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         NewRunnableMethod(
             this,
-            &KeyUtilityClientImpl::StartUtilityProcessInternal,
-            rdh));
+            &KeyUtilityClientImpl::StartUtilityProcessInternal));
     return;
   }
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(state_ == STATE_UNINITIALIZED);
 
   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();
 }
 
 void KeyUtilityClientImpl::EndUtilityProcessInternal() {
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         NewRunnableMethod(
@@ skipping 86 matching lines @@
 void KeyUtilityClientImpl::Client::OnInjectIDBKeyFinished(
     const SerializedScriptValue& value) {
   parent_->SetValueAfterInjection(value);
   parent_->FinishInjectingKey();
 }
 
 void KeyUtilityClientImpl::Client::OnIDBKeysFromValuesAndKeyPathFailed(
     int id) {
   parent_->FinishCreatingKeys();
 }