Fix and re-enable a test I broke with the find bar changes I made last night....

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2009 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/views/frame/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 1615 matching lines @@
 
   int top = LayoutTabStrip();
   top = LayoutToolbar(top);
   top = LayoutBookmarkAndInfoBars(top);
   int bottom = LayoutExtensionAndDownloadShelves();
   LayoutTabContents(top, bottom);
   // This must be done _after_ we lay out the TabContents since this code calls
   // back into us to find the bounding box the find bar must be laid out within,
   // and that code depends on the TabContentsContainer's bounds being up to
   // date.
-  FindBarController* find_controller = browser_->find_bar();
-  if (find_controller)
-    find_controller->find_bar()->MoveWindowIfNecessary(gfx::Rect(), true);
+  if (browser_->HasFindBarController()) {
+    browser_->GetFindBarController()->find_bar()->MoveWindowIfNecessary(
+        gfx::Rect(), true);
+  }
   // Align status bubble with the bottom of the contents_container_.
   LayoutStatusBubble(top + contents_container_->bounds().height());
   SchedulePaint();
 }
 
 void BrowserView::ViewHierarchyChanged(bool is_add,
                                        views::View* parent,
                                        views::View* child) {
   if (is_add && child == this && GetWidget() && !initialized_) {
     Init();
@@ skipping 607 matching lines @@
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }
 
 // static
 void BrowserList::AllBrowsersClosed() {
   views::Window::CloseAllSecondaryWindows();
 }