mac_views_browser: fixed interactive_ui_tests compilation.

chrome/test/base/interactive_test_utils_views.cc

Index: chrome/test/base/interactive_test_utils_views.cc
diff --git a/chrome/test/base/interactive_test_utils_views.cc b/chrome/test/base/interactive_test_utils_views.cc
index 7084e5d181991b0ce2b9e10b19c46a6b7889917a..3aa17e11733990d6da866091166d332b40ddca7f 100644
--- a/chrome/test/base/interactive_test_utils_views.cc
+++ b/chrome/test/base/interactive_test_utils_views.cc
@@ -4,22 +4,14 @@
 
 #include "chrome/test/base/interactive_test_utils.h"
 
-#include "base/logging.h"
 #include "base/message_loop/message_loop.h"
-#include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "ui/base/test/ui_controls.h"

[tapted, 2016/02/05 05:11:11]

nit: remove

[kirr, 2016/02/05 13:26:24]

Done.

-#include "ui/compositor/layer.h"
-#include "ui/compositor/layer_animator.h"
 #include "ui/views/focus/focus_manager.h"
 
 namespace ui_test_utils {
 
-// Until the whole browser UI is ported to tookit-views on Mac, these need to
-// use the definitions in interactive_test_utils_mac.mm.
-#if !defined(OS_MACOSX)
-
 bool IsViewFocused(const Browser* browser, ViewID vid) {
   BrowserWindow* browser_window = browser->window();
   DCHECK(browser_window);
@@ -50,30 +42,10 @@ void FocusView(const Browser* browser, ViewID vid) {
   view->RequestFocus();
 }
 
-#endif  // defined(OS_MACOSX)
-
-void MoveMouseToCenterAndPress(views::View* view,
-                               ui_controls::MouseButton button,
-                               int state,
-                               const base::Closure& closure) {
-  DCHECK(view);
-  DCHECK(view->GetWidget());
-  // Complete any in-progress animation before sending the events so that the
-  // mouse-event targetting happens reliably, and does not flake because of
-  // unreliable animation state.
-  ui::Layer* layer = view->GetWidget()->GetLayer();
-  if (layer) {
-    ui::LayerAnimator* animator = layer->GetAnimator();
-    if (animator && animator->is_animating())
-      animator->StopAnimating();
-  }
-
-  gfx::Point view_center(view->width() / 2, view->height() / 2);
-  views::View::ConvertPointToScreen(view, &view_center);
-  ui_controls::SendMouseMoveNotifyWhenDone(
-      view_center.x(),
-      view_center.y(),
-      base::Bind(&internal::ClickTask, button, state, closure));
+gfx::Point GetCenterInScreenCoordinates(const views::View* view) {
+  gfx::Point center(view->width() / 2, view->height() / 2);
+  views::View::ConvertPointToScreen(view, &center);
+  return center;
 }
 
 }  // namespace ui_test_utils