Move creation and ownership of ResourceDispatcherHost and PluginService to content. This gives a ...

content/browser/tab_contents/interstitial_page.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 "content/browser/tab_contents/interstitial_page.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 551 matching lines @@
 
   if (action == CANCEL || action == RESUME) {
     if (resource_dispatcher_host_notified_)
       return;
     resource_dispatcher_host_notified_ = true;
   }
 
   // The tab might not have a render_view_host if it was closed (in which case,
   // we have taken care of the blocked requests when processing
   // NOTIFY_RENDER_WIDGET_HOST_DESTROYED.
-  // Also we need to test there is a ResourceDispatcherHost, as when unit-tests
-  // we don't have one.
   RenderViewHost* rvh = RenderViewHost::FromID(original_child_id_,
                                                original_rvh_id_);
-  if (!rvh ||
-      !content::GetContentClient()->browser()->GetResourceDispatcherHost()) {
+  if (!rvh)
     return;
-  }
 
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(
           &ResourceRequestHelper,
-          content::GetContentClient()->browser()->GetResourceDispatcherHost(),
+          ResourceDispatcherHost::Get(),
           original_child_id_,
           original_rvh_id_,
           action));
 }
 
 // static
 void InterstitialPage::InitInterstitialPageMap() {
   if (!tab_to_interstitial_page_)
     tab_to_interstitial_page_ = new InterstitialPageMap;
 }
@@ skipping 89 matching lines @@
   if (!tab->GetViewDelegate())
     return;
 
   tab->GetViewDelegate()->TakeFocus(reverse);
 }
 
 void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply(
     int request_id, int number_of_matches, const gfx::Rect& selection_rect,
     int active_match_ordinal, bool final_update) {
 }