Do some refactoring of renderer_host....

chrome/browser/renderer_host/cross_site_resource_handler.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 <string>
 
 #include "chrome/browser/renderer_host/cross_site_resource_handler.h"
 
+#include "base/message_loop.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/tab_contents/tab_util.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 
 namespace {
+
 // Task to notify the TabContents that a cross-site response has begun, so that
 // TabContents can tell the old page to run its onunload handler.
-class CrossSiteNotifyTabTask : public Task {
+class CrossSiteNotifyTask : public Task {
  public:
-  CrossSiteNotifyTabTask(int render_process_host_id,
-                         int render_view_id,
-                         int request_id)
+  CrossSiteNotifyTask(int render_process_host_id,
+                      int render_view_id,
+                      int request_id)
     : render_process_host_id_(render_process_host_id),
       render_view_id_(render_view_id),
       request_id_(request_id) {}
 
   void Run() {
     RenderViewHost* view =
         RenderViewHost::FromID(render_process_host_id_, render_view_id_);
     if (view) {
       view->OnCrossSiteResponse(render_process_host_id_, request_id_);
     } else {
@@ skipping 10 matching lines @@
 };
 
 class CancelPendingRenderViewTask : public Task {
  public:
   CancelPendingRenderViewTask(int render_process_host_id,
                               int render_view_id)
     : render_process_host_id_(render_process_host_id),
       render_view_id_(render_view_id) {}
 
   void Run() {
-    TabContents* tab_contents =
-        tab_util::GetTabContentsByID(render_process_host_id_, render_view_id_);
-    if (tab_contents)
-      tab_contents->CrossSiteNavigationCanceled();
+    RenderViewHost* view =
+        RenderViewHost::FromID(render_process_host_id_, render_view_id_);
+    if (view)
+      view->delegate()->OnCrossSiteNavigationCanceled();
   }
 
  private:
   int render_process_host_id_;
   int render_view_id_;
 };
-}
+
+}  // namespace
 
 CrossSiteResourceHandler::CrossSiteResourceHandler(
     ResourceHandler* handler,
     int render_process_host_id,
     int render_view_id,
     ResourceDispatcherHost* resource_dispatcher_host)
     : next_handler_(handler),
       render_process_host_id_(render_process_host_id),
       render_view_id_(render_view_id),
       has_started_response_(false),
@@ skipping 171 matching lines @@
     // renderer is ready.
     rdh_->PauseRequest(render_process_host_id_, request_id, true);
   }
   // If our OnResponseStarted wasn't called, then we're being called by
   // OnResponseCompleted after a failure.  We don't need to pause, because
   // there will be no reads.
 
   // Tell the tab responsible for this request that a cross-site response is
   // starting, so that it can tell its old renderer to run its onunload
   // handler now.  We will wait to hear the corresponding ClosePage_ACK.
-  CrossSiteNotifyTabTask* task =
-      new CrossSiteNotifyTabTask(render_process_host_id_,
-                                 render_view_id_,
-                                 request_id);
+  CrossSiteNotifyTask* task =
+      new CrossSiteNotifyTask(render_process_host_id_,
+                              render_view_id_,
+                              request_id);
   rdh_->ui_loop()->PostTask(FROM_HERE, task);
 }