Make GetRootWindow() return a Window instead of a RootWindow.

ash/drag_drop/drag_drop_controller_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/drag_drop/drag_drop_controller.h"
 
 #include "ash/drag_drop/drag_drop_tracker.h"
 #include "ash/drag_drop/drag_image_view.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 265 matching lines @@
 
 void DispatchGesture(ui::EventType gesture_type, gfx::Point location) {
   ui::GestureEvent gesture_event(
       gesture_type,
       location.x(),
       location.y(),
       0,
       ui::EventTimeForNow(),
       ui::GestureEventDetails(gesture_type, 0, 0),
       1);
-  Shell::GetPrimaryRootWindow()->DispatchGestureEvent(&gesture_event);
+  Shell::GetPrimaryRootWindow()->GetDispatcher()->DispatchGestureEvent(
+      &gesture_event);
 }
 
 bool IsGestureEventType(ui::EventType type) {
   switch (type) {
     case ui::ET_GESTURE_SCROLL_BEGIN:
     case ui::ET_GESTURE_SCROLL_END:
     case ui::ET_GESTURE_SCROLL_UPDATE:
     case ui::ET_GESTURE_TAP:
     case ui::ET_GESTURE_TAP_CANCEL:
     case ui::ET_GESTURE_TAP_DOWN:
@@ skipping 458 matching lines @@
     if (i > 0)
       UpdateDragData(&data);
     generator.MoveMouseBy(0, 1);
 
     // We send a unexpected mouse move event. Note that we cannot use
     // EventGenerator since it implicitly turns these into mouse drag events.
     // The DragDropController should simply ignore these events.
     gfx::Point mouse_move_location = drag_view->bounds().CenterPoint();
     ui::MouseEvent mouse_move(ui::ET_MOUSE_MOVED, mouse_move_location,
                               mouse_move_location, 0);
-    Shell::GetPrimaryRootWindow()->AsRootWindowHostDelegate()->OnHostMouseEvent(
-        &mouse_move);
+    Shell::GetPrimaryRootWindow()->GetDispatcher()->AsRootWindowHostDelegate()->
+        OnHostMouseEvent(&mouse_move);
   }
 
   generator.ReleaseLeftButton();
 
   EXPECT_TRUE(drag_drop_controller_->drag_start_received_);
   EXPECT_EQ(num_drags - 1 - drag_view->VerticalDragThreshold(),
       drag_drop_controller_->num_drag_updates_);
   EXPECT_TRUE(drag_drop_controller_->drop_received_);
   EXPECT_EQ(UTF8ToUTF16("I am being dragged"),
       drag_drop_controller_->drag_string_);
@@ skipping 322 matching lines @@
     EXPECT_EQ("405,405", observer.window_location_on_destroying().ToString());
   }
   for (Shell::RootWindowList::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     aura::client::SetDragDropClient(*iter, NULL);
   }
 }
 
 }  // namespace test
 }  // namespace aura