Fixes FindBar crash. The crash appears to be because if you select a

chrome/browser/oom_priority_manager_browsertest.cc

 // Copyright (c) 2012 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/oom_priority_manager.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "googleurl/src/gurl.h"
 
 using content::OpenURLParams;
 
 namespace {
@@ skipping 72 matching lines @@
 
   // Kill the third tab
   EXPECT_TRUE(g_browser_process->oom_priority_manager()->DiscardTab());
   EXPECT_TRUE(browser()->IsTabDiscarded(0));
   EXPECT_TRUE(browser()->IsTabDiscarded(1));
   EXPECT_TRUE(browser()->IsTabDiscarded(2));
 
   // Running when all tabs are discarded should do nothing.
   EXPECT_FALSE(g_browser_process->oom_priority_manager()->DiscardTab());
 
+  // Force creation of the FindBarController.
+  browser()->GetFindBarController();
+
   // Select the first tab.  It should reload.
   WindowedNotificationObserver reload1(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::NotificationService::AllSources());
   browser()->SelectNumberedTab(0);
   reload1.Wait();
+  // Make sure the FindBarController gets the right TabContentsWrapper.
+  EXPECT_EQ(browser()->GetFindBarController()->tab_contents(),
+            browser()->GetSelectedTabContentsWrapper());
   EXPECT_EQ(0, browser()->active_index());
   EXPECT_FALSE(browser()->IsTabDiscarded(0));
   EXPECT_TRUE(browser()->IsTabDiscarded(1));
   EXPECT_TRUE(browser()->IsTabDiscarded(2));
 
   // Select the third tab. It should reload.
   WindowedNotificationObserver reload2(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::NotificationService::AllSources());
   browser()->SelectNumberedTab(2);
@@ skipping 17 matching lines @@
   WindowedNotificationObserver back2(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::NotificationService::AllSources());
   browser()->GoBack(CURRENT_TAB);
   back2.Wait();
   EXPECT_FALSE(browser()->CanGoBack());
   EXPECT_TRUE(browser()->CanGoForward());
 }
 
 }  // namespace