Couple of tweaks to ui_controls_linux:...

chrome/browser/browser_focus_uitest.cc

 // Copyright (c) 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.
 
 #include "base/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 63 matching lines @@
     EXPECT_TRUE(WidgetInFocusChain(GTK_WIDGET(window), widget)) <<
         "For view id " << vid;
 #else
     NOTIMPLEMENTED();
 #endif
   }
 
   void ClickOnView(ViewID vid) {
     BrowserWindow* browser_window = browser()->window();
     ASSERT_TRUE(browser_window);
-#if defined(OS_WIN)
+#if defined(TOOLKIT_VIEWS)
     views::View* view =
         reinterpret_cast<BrowserView*>(browser_window)->GetViewByID(vid);
 #elif defined(OS_LINUX)
     gfx::NativeWindow window = browser_window->GetNativeHandle();
     ASSERT_TRUE(window);
     GtkWidget* view = ViewIDUtil::GetWidget(GTK_WIDGET(window), vid);
 #endif
     ASSERT_TRUE(view);
     ui_controls::MoveMouseToCenterAndPress(
         view,
@@ skipping 607 matching lines @@
 
   // Open a regular page, crash, reload.
   ui_test_utils::NavigateToURL(browser(), server->TestServerPageW(kSimplePage));
   ui_test_utils::CrashTab(browser()->GetSelectedTabContents());
   browser()->Reload();
   ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
   // Focus should now be on the tab contents.
   browser()->ShowDownloadsTab();
   CheckViewHasFocus(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW);
 }