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

chrome/browser/browser.h

 // Copyright (c) 2006-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.
 
 #ifndef CHROME_BROWSER_BROWSER_H_
 #define CHROME_BROWSER_BROWSER_H_
 
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 118 matching lines @@
   void set_window(BrowserWindow* window) {
     DCHECK(!window_);
     window_ = window;
   }
 #endif
 
   BrowserWindow* window() const { return window_; }
   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);
 
   // Browser Creation Helpers /////////////////////////////////////////////////
 
   // Opens a new window with the default blank tab.
   static void OpenEmptyWindow(Profile* profile);
 
   // Opens a new window with the tabs from |profile|'s TabRestoreService.
@@ skipping 655 matching lines @@
   // Dialog box used for opening and saving files.
   scoped_refptr<SelectFileDialog> select_file_dialog_;
 
   // Keep track of the encoding auto detect pref.
   BooleanPrefMember encoding_auto_detect_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_H_