Remove some pass-thrus on RootWindow API in favor of exposing the RootWindowHost again.

ash/magnifier/magnification_controller_unittest.cc

 // Copyright (c) 2013 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/magnifier/magnification_controller.h"
 #include "ash/magnifier/magnifier_constants.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/strings/stringprintf.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 36 matching lines @@
     AshTestBase::TearDown();
   }
 
  protected:
   aura::Window* GetRootWindow() const {
     return Shell::GetPrimaryRootWindow();
   }
 
   std::string GetHostMouseLocation() {
     gfx::Point point;
-    GetRootWindow()->GetDispatcher()->QueryMouseLocationForTest(&point);
+    GetRootWindow()->GetDispatcher()->host()->QueryMouseLocation(&point);
     return point.ToString();
   }
 
   ash::MagnificationController* GetMagnificationController() const {
     return ash::Shell::GetInstance()->magnification_controller();
   }
 
   gfx::Rect GetViewport() const {
     gfx::RectF bounds(0, 0, kRootWidth, kRootHeight);
     GetRootWindow()->layer()->transform().TransformRectReverse(&bounds);
@@ skipping 365 matching lines @@
   scale *= kMagnificationScaleFactor;
   GetMagnificationController()->SetScale(scale, false);
   EXPECT_FLOAT_EQ(4.f, GetMagnificationController()->GetScale());
   generator.MoveMouseToInHost(gfx::Point(0, 300));
   EXPECT_EQ("139,298", env->last_mouse_location().ToString());
   EXPECT_EQ("100,300", GetHostMouseLocation());
 }
 
 }  // namespace internal
 }  // namespace ash