Window ownership -> WindowTreeHost

ash/test/ui_controls_factory_ash.cc

 // Copyright 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/shell.h"
 #include "ash/shell_factory.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/window_properties.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/screen_position_client.h"
@@ skipping 17 matching lines @@
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(UIControlsAura, kUIControlsKey, NULL);
 
 // Returns the UIControls object for RootWindow.
 // kUIControlsKey is owned property and UIControls object
 // will be deleted when the root window is deleted.
 UIControlsAura* GetUIControlsForRootWindow(aura::Window* root_window) {
   UIControlsAura* native_ui_control =
       root_window->GetProperty(kUIControlsKey);
   if (!native_ui_control) {
     native_ui_control =
-        aura::test::CreateUIControlsAura(root_window->GetDispatcher());
+        aura::test::CreateUIControlsAura(root_window->GetHost()->dispatcher());
     // Pass the ownership to the |root_window|.
     root_window->SetProperty(kUIControlsKey, native_ui_control);
   }
   return native_ui_control;
 }
 
 // Returns the UIControls object for the RootWindow at |point_in_screen|.
 UIControlsAura* GetUIControlsAt(const gfx::Point& point_in_screen) {
   // TODO(mazda): Support the case passive grab is taken.
   return GetUIControlsForRootWindow(ash::wm::GetRootWindowAt(point_in_screen));
@@ skipping 81 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(UIControlsAsh);
 };
 
 ui_controls::UIControlsAura* CreateAshUIControls() {
   return new ash::test::UIControlsAsh();
 }
 
 }  // namespace test
 }  // namespace ash