Revert revisions 47902 and 47900....

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 88 matching lines @@
   EXPECT_EQ(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD, GetFocusedViewID());
 
   // Select tab A.
   browser()->SelectTabContentsAt(0, true);
 
   // Close tab B.
   browser()->CloseTabContents(browser()->GetTabContentsAt(1));
 
   // Click on the location bar so that Find box loses focus.
   ClickOnView(VIEW_ID_LOCATION_BAR);
-#if defined(OS_WIN)
+#if defined(TOOLKIT_VIEWS) || defined(OS_WIN)
   // Check the location bar is focused.
   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,
       false, false, false, false, new MessageLoop::QuitTask());
   ui_test_utils::RunMessageLoop();
 }
@@ skipping 32 matching lines @@
   // 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()->GetFindBarController()->Show();
   EXPECT_EQ(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD, GetFocusedViewID());
   browser()->GetFindBarController()->EndFindSession(
       FindBarController::kKeepSelection);
   EXPECT_EQ(VIEW_ID_LOCATION_BAR, GetFocusedViewID());
 }