Rename Desktop->RootWindow.

ui/aura_shell/toplevel_layout_manager_unittest.cc

 // Copyright (c) 2011 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 "ui/aura_shell/toplevel_layout_manager.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/desktop.h"
+#include "ui/aura/root_window.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/aura/window.h"
 
 namespace aura_shell {
 
 namespace {
 
 class ToplevelLayoutManagerTest : public aura::test::AuraTestBase {
  public:
   ToplevelLayoutManagerTest() : layout_manager_(NULL) {}
   virtual ~ToplevelLayoutManagerTest() {}
 
   virtual void SetUp() OVERRIDE {
     aura::test::AuraTestBase::SetUp();
-    aura::Desktop::GetInstance()->screen()->set_work_area_insets(
+    aura::RootWindow::GetInstance()->screen()->set_work_area_insets(
         gfx::Insets(1, 2, 3, 4));
-    aura::Desktop::GetInstance()->SetHostSize(gfx::Size(500, 400));
+    aura::RootWindow::GetInstance()->SetHostSize(gfx::Size(500, 400));
     container_.reset(new aura::Window(NULL));
     container_->Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
     container_->SetBounds(gfx::Rect(0, 0, 500, 500));
     layout_manager_ = new internal::ToplevelLayoutManager();
     container_->SetLayoutManager(layout_manager_);
   }
 
   aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
     aura::Window* window = new aura::Window(NULL);
     window->Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
@@ skipping 30 matching lines @@
   gfx::Rect bounds(100, 100, 200, 200);
   scoped_ptr<aura::Window> window(CreateTestWindow(bounds));
   window->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   EXPECT_EQ(gfx::Screen::GetMonitorAreaNearestWindow(window.get()),
             window->bounds());
   window->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(bounds, window->bounds());
 }
 
 }  // namespace aura_shell