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

chrome/browser/external_tab_container_win.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/external_tab_container_win.h"
 
 #include <string>
 
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
@@ skipping 179 matching lines @@
   } else {
     TabContents* new_contents = new TabContents(profile, NULL, MSG_ROUTING_NONE,
                                                 NULL, NULL);
     tab_contents_.reset(new TabContentsWrapper(new_contents));
   }
 
   if (!infobars_enabled)
     tab_contents_->set_infobars_enabled(false);
 
   tab_contents_->tab_contents()->set_delegate(this);
-  tab_contents_->download_tab_helper()->set_delegate(this);
 
   tab_contents_->tab_contents()->
       GetMutableRendererPrefs()->browser_handles_top_level_requests =
           handle_top_level_requests;
 
   if (!existing_contents) {
     tab_contents_->render_view_host()->AllowBindings(
         BindingsPolicy::EXTERNAL_HOST);
   }
 
@@ skipping 342 matching lines @@
 
 bool ExternalTabContainer::TakeFocus(bool reverse) {
   if (automation_) {
     automation_->Send(new AutomationMsg_TabbedOut(tab_handle_,
         base::win::IsShiftPressed()));
   }
 
   return true;
 }
 
+bool ExternalTabContainer::CanDownload(int request_id) {
+  if (load_requests_via_automation_) {
+    if (automation_) {
+      // In case the host needs to show UI that needs to take the focus.
+      ::AllowSetForegroundWindow(ASFW_ANY);
+
+      BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+          NewRunnableMethod(automation_resource_message_filter_.get(),
+              &AutomationResourceMessageFilter::SendDownloadRequestToHost,
+              0, tab_handle_, request_id));
+    }
+  } else {
+    DLOG(WARNING) << "Downloads are only supported with host browser network "
+                     "stack enabled.";
+  }
+
+  // Never allow downloads.
+  return false;
+}
+
 void ExternalTabContainer::ShowPageInfo(Profile* profile,
                                         const GURL& url,
                                         const NavigationEntry::SSLStatus& ssl,
                                         bool show_history) {
   POINT cursor_pos = {0};
   GetCursorPos(&cursor_pos);
 
   gfx::Rect bounds;
   bounds.set_origin(gfx::Point(cursor_pos));
 
@@ skipping 234 matching lines @@
         UnregisterRenderViewHost(rvh);
       }
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ExternalTabContainer, DownloadTabHelperDelegate overrides:
-
-bool ExternalTabContainer::CanDownload(int request_id) {
-  if (load_requests_via_automation_) {
-    if (automation_) {
-      // In case the host needs to show UI that needs to take the focus.
-      ::AllowSetForegroundWindow(ASFW_ANY);
-
-      BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-          NewRunnableMethod(automation_resource_message_filter_.get(),
-              &AutomationResourceMessageFilter::SendDownloadRequestToHost,
-              0, tab_handle_, request_id));
-    }
-  } else {
-    DLOG(WARNING) << "Downloads are only supported with host browser network "
-                     "stack enabled.";
-  }
-
-  // Never allow downloads.
-  return false;
-}
-
-void ExternalTabContainer::OnStartDownload(DownloadItem* download,
-                                           TabContentsWrapper* tab) {
-  // Downloads are handled by Automation.
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
 // ExternalTabContainer, views::NativeWidgetWin overrides:
 
 LRESULT ExternalTabContainer::OnCreate(LPCREATESTRUCT create_struct) {
   LRESULT result = views::NativeWidgetWin::OnCreate(create_struct);
   if (result == 0) {
     // Grab a reference here which will be released in OnFinalMessage
     AddRef();
   }
   return result;
 }
@@ skipping 301 matching lines @@
 
   if (disposition == CURRENT_TAB) {
     DCHECK(route_all_top_level_navigations_);
     disposition = NEW_FOREGROUND_TAB;
   }
   ExternalTabContainer::OpenURLFromTab(source, url, referrer, disposition,
                                        transition);
   // support only one navigation for a dummy tab before it is killed.
   ::DestroyWindow(GetNativeView());
 }