Put the find bar back for mac and linux.

BUG=21443

Review URL: http://codereview.chromium.org/192060

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25836 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/browser.cc

@@ -308,11 +308,9 @@ void Browser::CreateBrowserWindow() {
     window_->GetLocationBar()->ShowFirstRunBubble(show_OEM_bubble);
   }
 
-#if defined(TOOLKIT_VIEWS)
   FindBar* find_bar = BrowserWindow::CreateFindBar(this);
   find_bar_controller_.reset(new FindBarController(find_bar));
   find_bar->SetFindBarController(find_bar_controller_.get());
-#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////

chrome/browser/gtk/view_id_util_browsertest.cc

@@ -23,9 +23,7 @@ class ViewIDTest : public InProcessBrowserTest {
   GtkWidget* root_window_;
 };
 
-// Disabled since it is failing on buildbots.
-// http://code.google.com/p/chromium/issues/detail?id=21443
-IN_PROC_BROWSER_TEST_F(ViewIDTest, DISABLED_Basic) {
+IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) {
   for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) {
     CheckViewID(static_cast<ViewID>(i), true);
   }