mac_views_browser: fixed interactive_ui_tests compilation.

chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc

 // Copyright 2015 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/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 39 matching lines @@
   ASSERT_TRUE(menu_view);
   BrowserActionsContainer* overflow_container =
       menu_view->container_for_testing();
   ASSERT_TRUE(overflow_container);
   ToolbarActionView* action_view =
       overflow_container->GetToolbarActionViewAt(0);
   EXPECT_TRUE(action_view->visible());
 
   // Click on the toolbar action to activate it.
   gfx::Point action_view_loc =
-      test::GetCenterInScreenCoordinates(action_view);
+      ui_test_utils::GetCenterInScreenCoordinates(action_view);
   ui_controls::SendMouseMove(action_view_loc.x(), action_view_loc.y());
   ui_controls::SendMouseEventsNotifyWhenDone(
       button, ui_controls::DOWN | ui_controls::UP, quit_closure);
 }
 
 void ActivateOverflowedActionWithKeyboard(Browser* browser,
                                           const base::Closure& closure) {
   AppMenuButton* app_menu_button = GetAppButtonFromBrowser(browser);
   EXPECT_TRUE(app_menu_button->IsMenuShowing());
   // We need to dispatch key events to the menu's native window, rather than the
@@ skipping 49 matching lines @@
   int second_row_index = overflow_container->toolbar_actions_bar()
                              ->platform_settings()
                              .icons_per_overflow_menu_row;
   ToolbarActionView* second_row_action =
       overflow_container->GetToolbarActionViewAt(second_row_index);
 
   EXPECT_TRUE(second_row_action->visible());
   EXPECT_TRUE(second_row_action->enabled());
 
   gfx::Point action_view_loc =
-      test::GetCenterInScreenCoordinates(second_row_action);
+      ui_test_utils::GetCenterInScreenCoordinates(second_row_action);
   gfx::Point action_view_loc_in_menu_item_bounds = action_view_loc;
   views::View::ConvertPointFromScreen(first_menu_item,
                                       &action_view_loc_in_menu_item_bounds);
   // Regression test for crbug.com/538414: The first menu item is overlapping
   // the second row action button. With crbug.com/538414, the click would go to
   // the menu button, instead of the menu item.
   EXPECT_TRUE(
       first_menu_item->HitTestPoint(action_view_loc_in_menu_item_bounds));
 
   // Click on the first menu item (which shares bounds, but overlaps, the second
@@ skipping 67 matching lines @@
   ToolbarActionsModel::Get(profile())->SetVisibleIconCount(0);
 
   // When the extension is activated, it will send a message that its popup
   // opened. Listen for the message.
   ExtensionTestMessageListener listener("Popup opened", false);
 
   AppMenuButton* app_menu_button = GetAppButtonFromBrowser(browser());
 
   // Click on the app button.
   gfx::Point app_button_loc =
-      test::GetCenterInScreenCoordinates(app_menu_button);
+      ui_test_utils::GetCenterInScreenCoordinates(app_menu_button);
   base::RunLoop loop;
   ui_controls::SendMouseMove(app_button_loc.x(), app_button_loc.y());
   ui_controls::SendMouseEventsNotifyWhenDone(
       ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP,
       base::Bind(&TestOverflowedToolbarAction, browser(), ui_controls::LEFT,
                  loop.QuitClosure()));
   loop.Run();
   // The app menu should no longer be showing.
   EXPECT_FALSE(app_menu_button->IsMenuShowing());
 
@@ skipping 42 matching lines @@
   // Set a callback for the context menu showing.
   bool did_test_while_menu_open = false;
   base::Callback<void(ToolbarActionView*)> context_menu_callback(
       base::Bind(&OnContextMenuWillShow, &did_test_while_menu_open, browser()));
   ToolbarActionView::set_context_menu_callback_for_testing(
       &context_menu_callback);
 
   AppMenuButton* app_menu_button = GetAppButtonFromBrowser(browser());
   // Click on the app button, and then right-click on the first toolbar action.
   gfx::Point app_button_loc =
-      test::GetCenterInScreenCoordinates(app_menu_button);
+      ui_test_utils::GetCenterInScreenCoordinates(app_menu_button);
   base::RunLoop loop;
   ui_controls::SendMouseMove(app_button_loc.x(), app_button_loc.y());
   ui_controls::SendMouseEventsNotifyWhenDone(
       ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP,
       base::Bind(&TestOverflowedToolbarAction, browser(), ui_controls::RIGHT,
                  loop.QuitClosure()));
   loop.Run();
 
   // Test is continued first in TestOverflowedToolbarAction() to right click on
   // the action, followed by OnContextMenuWillShow() and
@@ skipping 24 matching lines @@
       browser_actions_container->toolbar_actions_bar();
   ToolbarActionView* toolbar_action_view =
       browser_actions_container->GetToolbarActionViewAt(0);
 
   // When the extension is activated, it will send a message that its popup
   // opened. Listen for the message.
   ExtensionTestMessageListener listener("Popup opened", false);
 
   // Click on the action, and wait for the popup to fully load.
   EXPECT_TRUE(ui_test_utils::SendMouseMoveSync(
-      test::GetCenterInScreenCoordinates(toolbar_action_view)));
+     ui_test_utils::GetCenterInScreenCoordinates(toolbar_action_view)));
 
   EXPECT_TRUE(ui_test_utils::SendMouseEventsSync(
       ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP));
   listener.WaitUntilSatisfied();
 
   ExtensionActionViewController* view_controller =
       static_cast<ExtensionActionViewController*>(
           toolbar_action_view->view_controller());
   EXPECT_EQ(view_controller, toolbar_actions_bar->popup_owner());
   EXPECT_TRUE(view_controller->is_showing_popup());
@@ skipping 17 matching lines @@
   EXPECT_FALSE(view_controller->is_showing_popup());
   EXPECT_EQ(nullptr, toolbar_actions_bar->popup_owner());
 
   // Releasing the mouse shouldn't result in the popup being shown again.
   EXPECT_TRUE(
       ui_test_utils::SendMouseEventsSync(ui_controls::LEFT, ui_controls::UP));
   EXPECT_FALSE(view_controller->is_showing_popup());
   EXPECT_EQ(nullptr, toolbar_actions_bar->popup_owner());
 }
 
-#if defined(USE_OZONE)
+#if defined(USE_OZONE) || defined(OS_MACOSX)

[tapted, 2016/02/09 22:06:07]

Can you undo this bit? There shouldn't be a need for the ||defined(OS_MACOSX)
yet. At this stage we are just looking for compile regressions in the
mac_views_browser=1 build so we can bring up a buildbot. This test won't be run
by default yet, and there's likely a few systemic problems that will fix a bunch
of tests in one go.

[themblsha, 2016/02/10 10:28:31]

Okay. It compiled (I replaced test:: with ui_test_utils::), but I only tested on
a Mac. And it crashed when I tried running it. Will remove OS_MACOSX now.

 // ozone bringup - http://crbug.com/401304
 #define MAYBE_ActivateOverflowedToolbarActionWithKeyboard \
   DISABLED_ActivateOverflowedToolbarActionWithKeyboard
 #else
 #define MAYBE_ActivateOverflowedToolbarActionWithKeyboard \
   ActivateOverflowedToolbarActionWithKeyboard
 #endif
 IN_PROC_BROWSER_TEST_F(ToolbarActionViewInteractiveUITest,
                        MAYBE_ActivateOverflowedToolbarActionWithKeyboard) {
   views::MenuController::TurnOffMenuSelectionHoldForTest();
   // Load an extension with an action.
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("ui").AppendASCII("browser_action_popup")));
   base::RunLoop().RunUntilIdle();  // Ensure the extension is fully loaded.
 
   // Reduce visible count to 0 so that all actions are overflowed.
   ToolbarActionsModel::Get(profile())->SetVisibleIconCount(0);
 
   // Set up a listener for the extension being triggered.
   ExtensionTestMessageListener listener("Popup opened", false);
 
   // Open the app menu, navigate to the toolbar action, and activate it via the
   // keyboard.
   AppMenuButton* app_menu_button = GetAppButtonFromBrowser(browser());
   gfx::Point app_button_loc =
-      test::GetCenterInScreenCoordinates(app_menu_button);
+      ui_test_utils::GetCenterInScreenCoordinates(app_menu_button);
   base::RunLoop loop;
   ui_controls::SendMouseMove(app_button_loc.x(), app_button_loc.y());
   ui_controls::SendMouseEventsNotifyWhenDone(
       ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP,
       base::Bind(&ActivateOverflowedActionWithKeyboard,
                  browser(), loop.QuitClosure()));
   loop.Run();
 
   // The app menu should no longer be showing.
   EXPECT_FALSE(app_menu_button->IsMenuShowing());
   // And the extension should have been activated.
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 }