Rename Desktop->RootWindow.

ui/aura_shell/workspace/workspace_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/workspace/workspace_manager.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/aura/test/test_stacking_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/workspace/workspace.h"
 #include "ui/aura_shell/workspace/workspace_observer.h"
 #include "ui/base/ui_base_types.h"
 
 namespace {
 using aura_shell::internal::Workspace;
@@ skipping 147 matching lines @@
   viewport()->AddChild(w1.get());
   EXPECT_TRUE(ws1->AddWindowAfter(w1.get(), NULL));
   manager_->SetWorkspaceSize(gfx::Size(50, 50));
 
   // ws1 is laied out in left most position.
   EXPECT_EQ("0,0 50x50", ws1->bounds().ToString());
   EXPECT_EQ("0,0 50x50", w1->layer()->GetTargetBounds().ToString());
 }
 
 TEST_F(WorkspaceManagerTest, WorkspaceManagerDragArea) {
-  aura::Desktop::GetInstance()->screen()->set_work_area_insets(
+  aura::RootWindow::GetInstance()->screen()->set_work_area_insets(
       gfx::Insets(10, 10, 10, 10));
   viewport()->SetBounds(gfx::Rect(0, 0, 200, 200));
   EXPECT_EQ("10,10 180x180", manager_->GetDragAreaBounds().ToString());
 }
 
 TEST_F(WorkspaceManagerTest, WorkspaceManagerActivate) {
   TestWorkspaceObserver observer(manager_.get());
   Workspace* ws1 = manager_->CreateWorkspace();
   Workspace* ws2 = manager_->CreateWorkspace();
   EXPECT_EQ(NULL, manager_->GetActiveWorkspace());
@@ skipping 362 matching lines @@
 
   w2->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   EXPECT_TRUE(ws->ContainsFullscreenWindow());
 
   w2->Hide();
   EXPECT_FALSE(ws->ContainsFullscreenWindow());
 }
 
 }  // namespace internal
 }  // namespace aura_shell