Move download stuff from download helper back to TabContents. This is basically a revert of r8576...

chrome/browser/prerender/prerender_contents.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/prerender/prerender_contents.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/process_util.h"
@@ skipping 70 matching lines @@
 
   // TabContentsDelegate implementation:
   virtual bool ShouldAddNavigationToHistory(
       const history::HistoryAddPageArgs& add_page_args,
       NavigationType::Type navigation_type) OVERRIDE {
     add_page_vector_.push_back(
         scoped_refptr<history::HistoryAddPageArgs>(add_page_args.Clone()));
     return false;
   }
 
+  bool CanDownload(TabContents* source, int request_id) OVERRIDE {
+    prerender_contents_->Destroy(FINAL_STATUS_DOWNLOAD);
+    // Cancel the download.
+    return false;
+  }
+
+  void OnStartDownload(TabContents* source, DownloadItem* download) OVERRIDE {
+    // Prerendered pages should never be able to download files.
+    NOTREACHED();
+  }
+
   // Commits the History of Pages to the given TabContents.
   void CommitHistory(TabContentsWrapper* tab) {
     for (size_t i = 0; i < add_page_vector_.size(); ++i)
       tab->history_tab_helper()->UpdateHistoryForNavigation(
           add_page_vector_[i].get());
   }
 
  private:
   typedef std::vector<scoped_refptr<history::HistoryAddPageArgs> >
       AddPageVector;
@@ skipping 42 matching lines @@
     const RenderViewHost* source_render_view_host) {
   DCHECK(profile_ != NULL);
   DCHECK(!prerendering_has_started_);
   DCHECK(prerender_contents_.get() == NULL);
 
   prerendering_has_started_ = true;
   TabContents* new_contents = new TabContents(profile_, NULL, MSG_ROUTING_NONE,
                                               NULL, NULL);
   prerender_contents_.reset(new TabContentsWrapper(new_contents));
   TabContentsObserver::Observe(new_contents);
-  prerender_contents_->download_tab_helper()->set_delegate(this);
 
   gfx::Rect tab_bounds;
   if (source_render_view_host) {
     DCHECK(source_render_view_host->view() != NULL);
     TabContents* source_tc =
         source_render_view_host->delegate()->GetAsTabContents();
     if (source_tc) {
       // So that history merging will work, get the max page ID
       // of the old page as a starting id.
       starting_page_id_ = source_tc->GetMaxPageID();
@@ skipping 346 matching lines @@
   }
   set_final_status(final_status);
 
   // We may destroy the PrerenderContents before we have initialized the
   // RenderViewHost. Otherwise set the Observer's PrerenderContents to NULL to
   // avoid any more messages being sent.
   if (render_view_host_observer_.get())
     render_view_host_observer_->set_prerender_contents(NULL);
 }
 
-bool PrerenderContents::CanDownload(int request_id) {
-  Destroy(FINAL_STATUS_DOWNLOAD);
-  // Cancel the download.
-  return false;
-}
-
-void PrerenderContents::OnStartDownload(DownloadItem* download,
-                                        TabContentsWrapper* tab) {
-  // Prerendered pages should never be able to download files.
-  NOTREACHED();
-}
-
 base::ProcessMetrics* PrerenderContents::MaybeGetProcessMetrics() {
   if (process_metrics_.get() == NULL) {
     // If a PrenderContents hasn't started prerending, don't be fully formed.
     if (!render_view_host() || !render_view_host()->process())
       return NULL;
     base::ProcessHandle handle = render_view_host()->process()->GetHandle();
     if (handle == base::kNullProcessHandle)
       return NULL;
 #if !defined(OS_MACOSX)
     process_metrics_.reset(base::ProcessMetrics::CreateProcessMetrics(handle));
@@ skipping 15 matching lines @@
   size_t private_bytes, shared_bytes;
   if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes) &&
       private_bytes > prerender_manager_->config().max_bytes) {
       Destroy(FINAL_STATUS_MEMORY_LIMIT_EXCEEDED);
   }
 }
 
 TabContentsWrapper* PrerenderContents::ReleasePrerenderContents() {
   prerender_contents_->tab_contents()->set_delegate(NULL);
   render_view_host_observer_.reset();
-  prerender_contents_->download_tab_helper()->set_delegate(NULL);
   TabContentsObserver::Observe(NULL);
   return prerender_contents_.release();
 }
 
 RenderViewHostDelegate* PrerenderContents::GetRenderViewHostDelegate() {
   if (!prerender_contents_.get())
     return NULL;
   return prerender_contents_->tab_contents();
 }
 
@@ skipping 17 matching lines @@
     return NULL;
   DictionaryValue* dict_value = new DictionaryValue();
   dict_value->SetString("url", prerender_url_.spec());
   base::TimeTicks current_time = base::TimeTicks::Now();
   base::TimeDelta duration = current_time - load_start_time_;
   dict_value->SetInteger("duration", duration.InSeconds());
   return dict_value;
 }
 
 }  // namespace prerender