Window ownership -> WindowTreeHost

ash/shell_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/shell.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 380 matching lines @@
 }
 
 TEST_F(ShellTest, ManagedWindowModeBasics) {
   // We start with the usual window containers.
   ExpectAllContainers();
   // Shelf is visible.
   ShelfWidget* shelf_widget = Shelf::ForPrimaryDisplay()->shelf_widget();
   EXPECT_TRUE(shelf_widget->IsVisible());
   // Shelf is at bottom-left of screen.
   EXPECT_EQ(0, shelf_widget->GetWindowBoundsInScreen().x());
-  EXPECT_EQ(Shell::GetPrimaryRootWindow()->GetDispatcher()->host()->
-      GetBounds().height(),
-      shelf_widget->GetWindowBoundsInScreen().bottom());
+  EXPECT_EQ(Shell::GetPrimaryRootWindow()->GetHost()->GetBounds().height(),
+            shelf_widget->GetWindowBoundsInScreen().bottom());
   // We have a desktop background but not a bare layer.
   // TODO (antrim): enable once we find out why it fails component build.
   //  internal::DesktopBackgroundWidgetController* background =
   //      Shell::GetPrimaryRootWindow()->
   //          GetProperty(internal::kWindowDesktopComponent);
   //  EXPECT_TRUE(background);
   //  EXPECT_TRUE(background->widget());
   //  EXPECT_FALSE(background->layer());
 
   // Create a normal window.  It is not maximized.
@@ skipping 115 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellTest2);
 };
 
 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {
   window_.reset(new aura::Window(NULL));
   window_->Init(aura::WINDOW_LAYER_NOT_DRAWN);
 }
 
 }  // namespace ash