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

chrome/browser/ui/views/find_bar_host.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/ui/views/find_bar_host.h"
 
 #include <algorithm>
 
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
@@ skipping 51 matching lines @@
         break;
     // Fall through.
     default:
       return false;
   }
 
   TabContentsWrapper* contents = find_bar_controller_->tab_contents();
   if (!contents)
     return false;
 
-  RenderViewHost* render_view_host = contents->render_view_host();
+  RenderViewHost* render_view_host =
+      contents->tab_contents()->render_view_host();
 
   // Make sure we don't have a text field element interfering with keyboard
   // input. Otherwise Up and Down arrow key strokes get eaten. "Nom Nom Nom".
   render_view_host->ClearFocusedNode();
   NativeWebKeyboardEvent event = GetKeyboardEvent(contents->tab_contents(),
                                                   key_event);
   render_view_host->ForwardKeyboardEvent(event);
   return true;
 }
 
@@ skipping 229 matching lines @@
   focus_manager()->UnregisterAccelerator(escape, this);
 
   DropdownBarHost::UnregisterAccelerators();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // private:
 
 void FindBarHost::GetWidgetPositionNative(gfx::Rect* avoid_overlapping_rect) {
   gfx::Rect frame_rect = host()->GetTopLevelWidget()->GetWindowScreenBounds();
-  TabContentsView* tab_view = find_bar_controller_->tab_contents()->view();
+  TabContentsView* tab_view =
+      find_bar_controller_->tab_contents()->tab_contents()->view();
   gfx::Rect webcontents_rect;
   tab_view->GetViewBounds(&webcontents_rect);
   avoid_overlapping_rect->Offset(0, webcontents_rect.y() - frame_rect.y());
 }
 
 FindBarView* FindBarHost::find_bar_view() {
   return static_cast<FindBarView*>(view());
 }