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

chrome/browser/autofill/autofill_external_delegate.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 "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/browser/renderer_host/render_view_host.h"
+#include "content/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 AutofillExternalDelegate::~AutofillExternalDelegate() {
 }
 
 AutofillExternalDelegate::AutofillExternalDelegate(
     TabContentsWrapper* tab_contents_wrapper)
     : tab_contents_wrapper_(tab_contents_wrapper),
       autofill_query_id_(0),
       display_warning_if_disabled_(false),
       has_shown_autofill_popup_for_current_edit_(false) {
 }
 
 void AutofillExternalDelegate::SelectAutofillSuggestionAtIndex(int listIndex) {
-  RenderViewHost* host = tab_contents_wrapper_->render_view_host();
+  RenderViewHost* host =
+      tab_contents_wrapper_->tab_contents()->render_view_host();
   host->Send(new AutofillMsg_SelectAutofillSuggestionAtIndex(
                  host->routing_id(),
                  listIndex));
 }
 
 void AutofillExternalDelegate::OnQuery(int query_id,
                                        const webkit_glue::FormData& form,
                                        const webkit_glue::FormField& field,
                                        const gfx::Rect& bounds,
                                        bool display_warning_if_disabled) {
@@ skipping 95 matching lines @@
 // none, so all platforms use the default.
 
 #if !defined(OS_ANDROID)
 
 AutofillExternalDelegate* AutofillExternalDelegate::Create(
     TabContentsWrapper*, AutofillManager*) {
   return NULL;
 }
 
 #endif