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

chrome/browser/views/find_bar_host_interactive_uitest.cc

 // Copyright (c) 2006-2008 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/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/find_bar_controller.h"
@@ skipping 92 matching lines @@
   EXPECT_EQ(VIEW_ID_LOCATION_BAR, GetFocusedViewID());
 #endif
 
   // This used to crash until bug 1303709 was fixed.
   ui_controls::SendKeyPressNotifyWhenDone(
       browser()->window()->GetNativeHandle(), base::VKEY_ESCAPE,
       true, false, false, new MessageLoop::QuitTask());
   ui_test_utils::RunMessageLoop();
 }
 
 // TODO: http://crbug.com/26231

[Paweł Hajdan Jr., 2009/10/29 20:45:32]

This comment is probably outdated.

-IN_PROC_BROWSER_TEST_F(FindInPageTest, DISABLED_FocusRestore) {
+IN_PROC_BROWSER_TEST_F(FindInPageTest, FocusRestore) {
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
 
   GURL url = server->TestServerPageW(L"title1.html");
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Focus the location bar, open and close the find-in-page, focus should
   // return to the location bar.
   browser()->FocusLocationBar();
   EXPECT_EQ(VIEW_ID_LOCATION_BAR, GetFocusedViewID());
-  browser()->find_bar()->Show();
+  // Ensure the creation of the find bar controller.
+  browser()->GetFindBarController()->Show();
   EXPECT_EQ(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD, GetFocusedViewID());
-  browser()->find_bar()->EndFindSession();
+  browser()->GetFindBarController()->EndFindSession();
   EXPECT_EQ(VIEW_ID_LOCATION_BAR, GetFocusedViewID());
 
   // Focus the location bar, find something on the page, close the find box,
   // focus should go to the page.
   browser()->FocusLocationBar();
   browser()->Find();
   EXPECT_EQ(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD, GetFocusedViewID());
   ui_test_utils::FindInPage(browser()->GetSelectedTabContents(),
                             L"a", true, false, NULL);
-  browser()->find_bar()->EndFindSession();
+  browser()->GetFindBarController()->EndFindSession();
   EXPECT_EQ(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW, GetFocusedViewID());
 
   // Focus the location bar, open and close the find box, focus should return to
   // the location bar (same as before, just checking that http://crbug.com/23599
   // is fixed).
   browser()->FocusLocationBar();
   EXPECT_EQ(VIEW_ID_LOCATION_BAR, GetFocusedViewID());
-  browser()->find_bar()->Show();
+  browser()->GetFindBarController()->Show();
   EXPECT_EQ(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD, GetFocusedViewID());
-  browser()->find_bar()->EndFindSession();
+  browser()->GetFindBarController()->EndFindSession();
   EXPECT_EQ(VIEW_ID_LOCATION_BAR, GetFocusedViewID());
 }