Making the browser tests work on Unix

chrome/test/ui_test_utils.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 "chrome/test/ui_test_utils.h"
 
 #include "base/json_reader.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
+#if defined (OS_WIN)
+#include "views/widget/accelerator_handler.h"
+#endif
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
-#include "views/widget/accelerator_handler.h"
 
 namespace ui_test_utils {
 
 namespace {
 
 // Used to block until a navigation completes.
 class NavigationNotificationObserver : public NotificationObserver {
  public:
   NavigationNotificationObserver(NavigationController* controller,
                                  int number_of_navigations)
@@ skipping 64 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(DOMOperationObserver);
 };
 
 }  // namespace
 
 void RunMessageLoop() {
   MessageLoopForUI* loop = MessageLoopForUI::current();
   bool did_allow_task_nesting = loop->NestableTasksAllowed();
   loop->SetNestableTasksAllowed(true);
+#if defined (OS_WIN)
   views::AcceleratorHandler handler;
   loop->Run(&handler);
+#else
+  loop->Run();
+#endif
   loop->SetNestableTasksAllowed(did_allow_task_nesting);
 }
 
 void WaitForNavigation(NavigationController* controller) {
   WaitForNavigations(controller, 1);
 }
 
 void WaitForNavigations(NavigationController* controller,
                         int number_of_navigations) {
   NavigationNotificationObserver observer(controller, number_of_navigations);
@@ skipping 79 matching lines @@
 
 GURL GetTestUrl(const std::wstring& dir, const std::wstring file) {
   FilePath path;
   PathService::Get(chrome::DIR_TEST_DATA, &path);
   path = path.Append(FilePath::FromWStringHack(dir));
   path = path.Append(FilePath::FromWStringHack(file));
   return net::FilePathToFileURL(path);
 }
 
 }  // namespace ui_test_utils