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

chrome/browser/browser.h

Index: chrome/browser/browser.h
===================================================================
--- chrome/browser/browser.h	(revision 30478)
+++ chrome/browser/browser.h	(working copy)
@@ -136,12 +136,17 @@
   ToolbarModel* toolbar_model() { return &toolbar_model_; }
   const SessionID& session_id() const { return session_id_; }
   CommandUpdater* command_updater() { return &command_updater_; }
-  FindBarController* find_bar() { return find_bar_controller_.get(); }
-  FindBarController* GetFindBarController();
   ExtensionShelfModel* extension_shelf_model() {
     return extension_shelf_model_.get();
   }
 
+  // Get the FindBarController for this browser, creating it if it does not
+  // yet exist.
+  FindBarController* GetFindBarController();
+
+  // Returns true if a FindBarController exists for this browser.
+  bool HasFindBarController() const;
+
   // Setters /////////////////////////////////////////////////////////////////
 
   void set_user_data_dir_profiles(const std::vector<std::wstring>& profiles);