Clean up TCW, make it solely a hub for 1:1 observer/helper objects.

chrome/browser/download/download_request_limiter.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/download/download_request_limiter.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "chrome/browser/download/download_request_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
@@ skipping 269 matching lines @@
   // If the tab requesting the download is a constrained popup that is not
   // shown, treat the request as if it came from the parent.
   TabContentsWrapper* effective_wrapper = originating_tab;
   if (effective_wrapper->blocked_content_tab_helper()->delegate()) {
     effective_wrapper = effective_wrapper->blocked_content_tab_helper()->
         delegate()->GetConstrainingContentsWrapper(effective_wrapper);
   }
 
   TabDownloadState* state = GetDownloadState(
       &effective_wrapper->tab_contents()->controller(),
-      &originating_tab->controller(), true);
+      &originating_tab->tab_contents()->controller(), true);
   switch (state->download_status()) {
     case ALLOW_ALL_DOWNLOADS:
       if (state->download_count() && !(state->download_count() %
             DownloadRequestLimiter::kMaxDownloadsAtOnce))
         state->set_download_status(PROMPT_BEFORE_DOWNLOAD);
       ScheduleNotification(callback, true);
       state->increment_download_count();
       break;
 
     case ALLOW_ONE_DOWNLOAD:
@@ skipping 33 matching lines @@
 
 void DownloadRequestLimiter::Remove(TabDownloadState* state) {
   DCHECK(ContainsKey(state_map_, state->controller()));
   state_map_.erase(state->controller());
   delete state;
 }
 
 // static
 DownloadRequestLimiter::TestingDelegate* DownloadRequestLimiter::delegate_ =
     NULL;