mash: Convert WebNotificationTray to wm common types

ash/system/web_notification/web_notification_tray_unittest.cc

 // Copyright (c) 2012 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 "ash/system/web_notification/web_notification_tray.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/display/display_manager.h"
-#include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/web_notification/ash_popup_alignment_delegate.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/status_area_widget_test_helper.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 413 matching lines @@
   widget->SetFullscreen(true);
   RunAllPendingInMessageLoop();
 
   // The work area for auto-hidden status of fullscreen is a bit larger
   // since it doesn't even have the 3-pixel width.
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
   int bottom_fullscreen_hidden = GetPopupWorkAreaBottom();
   EXPECT_EQ(bottom_auto_hidden, bottom_fullscreen_hidden);
 
   // Move the mouse cursor at the bottom, which shows the shelf.
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  ui::test::EventGenerator& generator = GetEventGenerator();
   gfx::Point bottom_right =
       display::Screen::GetScreen()->GetPrimaryDisplay().bounds().bottom_right();
   bottom_right.Offset(-1, -1);
   generator.MoveMouseTo(bottom_right);
   shelf->shelf_layout_manager()->UpdateAutoHideStateNow();
   EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
   EXPECT_EQ(bottom, GetPopupWorkAreaBottom());
 
   generator.MoveMouseTo(
       display::Screen::GetScreen()->GetPrimaryDisplay().bounds().CenterPoint());
@@ skipping 20 matching lines @@
 // EventGenerator.PressTouch/ReleaseTouch. Currently they set a width on the
 // touch event causing the gesture recognizer to target a different view.
 #if defined(OS_CHROMEOS)
 // Tests that there is visual feedback for touch presses.
 TEST_F(WebNotificationTrayTest, TouchFeedback) {
   AddNotification("test_id");
   RunAllPendingInMessageLoop();
   WebNotificationTray* tray = GetTray();
   EXPECT_TRUE(tray->visible());
 
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  ui::test::EventGenerator& generator = GetEventGenerator();
   const int touch_id = 0;
   gfx::Point center_point = tray->GetBoundsInScreen().CenterPoint();
 
   ui::TouchEvent press(ui::ET_TOUCH_PRESSED, center_point, touch_id,
                        generator.Now());
   generator.Dispatch(&press);
   EXPECT_TRUE(tray->draw_background_as_active());
 
   ui::TouchEvent release(ui::ET_TOUCH_RELEASED, center_point, touch_id,
       press.time_stamp() + base::TimeDelta::FromMilliseconds(50));
   generator.Dispatch(&release);
   EXPECT_TRUE(tray->draw_background_as_active());
   EXPECT_TRUE(tray->IsMessageCenterBubbleVisible());
 
   generator.GestureTapAt(center_point);
   EXPECT_FALSE(tray->draw_background_as_active());
   EXPECT_FALSE(tray->IsMessageCenterBubbleVisible());
 }
 
 // Tests that while touch presses trigger visual feedback, that subsequent non
 // tap gestures cancel the feedback without triggering the message center.
 TEST_F(WebNotificationTrayTest, TouchFeedbackCancellation) {
   AddNotification("test_id");
   RunAllPendingInMessageLoop();
   WebNotificationTray* tray = GetTray();
   EXPECT_TRUE(tray->visible());
 
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  ui::test::EventGenerator& generator = GetEventGenerator();
   const int touch_id = 0;
   gfx::Rect bounds = tray->GetBoundsInScreen();
   gfx::Point center_point = bounds.CenterPoint();
 
   ui::TouchEvent press(ui::ET_TOUCH_PRESSED, center_point, touch_id,
                        generator.Now());
   generator.Dispatch(&press);
   EXPECT_TRUE(tray->draw_background_as_active());
 
   gfx::Point out_of_bounds(bounds.x() - 1, center_point.y());
   ui::TouchEvent move(ui::ET_TOUCH_MOVED, out_of_bounds, touch_id,
                       press.time_stamp()+base::TimeDelta::FromMilliseconds(50));
   generator.Dispatch(&move);
   EXPECT_FALSE(tray->draw_background_as_active());
 
   ui::TouchEvent release(ui::ET_TOUCH_RELEASED, out_of_bounds, touch_id,
       move.time_stamp()+base::TimeDelta::FromMilliseconds(50));
   generator.Dispatch(&release);
   EXPECT_FALSE(tray->draw_background_as_active());
   EXPECT_FALSE(tray->IsMessageCenterBubbleVisible());
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace ash