Rename GetRootWindow() -> GetPrimaryRootWindow()

ash/wm/workspace/workspace_window_resizer_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/wm/workspace/workspace_window_resizer.h"
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/property_util.h"
@@ skipping 32 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestWindowDelegate);
 };
 
 class WorkspaceWindowResizerTest : public test::AshTestBase {
  public:
   WorkspaceWindowResizerTest() : window_(NULL) {}
   virtual ~WorkspaceWindowResizerTest() {}
 
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
-    aura::RootWindow* root = Shell::GetInstance()->GetRootWindow();
+    aura::RootWindow* root = Shell::GetPrimaryRootWindow();
     root->SetHostSize(gfx::Size(800, kRootHeight));
 
     gfx::Rect root_bounds(root->bounds());
     EXPECT_EQ(kRootHeight, root_bounds.height());
     Shell::GetInstance()->SetMonitorWorkAreaInsets(root, gfx::Insets());
     window_.reset(new aura::Window(&delegate_));
     window_->Init(ui::LAYER_NOT_DRAWN);
     window_->SetParent(root);
     window_->set_id(1);
 
@@ skipping 14 matching lines @@
     window3_.reset();
     AshTestBase::TearDown();
   }
 
   // Returns a string identifying the z-order of each of the known windows.
   // The returned string constains the id of the known windows and is ordered
   // from topmost to bottomost windows.
   std::string WindowOrderAsString() const {
     std::string result;
     const aura::Window::Windows& windows =
-        Shell::GetInstance()->GetRootWindow()->children();
+        Shell::GetPrimaryRootWindow()->children();
     for (aura::Window::Windows::const_reverse_iterator i = windows.rbegin();
          i != windows.rend(); ++i) {
       if (*i == window_.get() || *i == window2_.get() || *i == window3_.get()) {
         if (!result.empty())
           result += " ";
         result += base::IntToString((*i)->id());
       }
     }
     return result;
   }
@@ skipping 243 matching lines @@
   resizer->RevertDrag();
   EXPECT_EQ("0,50 400x200", window_->bounds().ToString());
   EXPECT_EQ("0,250 200x100", window2_->bounds().ToString());
 }
 
 // Assertions around attached window resize dragging from the bottom with 3
 // windows.
 // TODO(oshima): Host window doesn't get a resize event after
 // SetHostSize on Windows trybot, which gives wrong work/monitor area.
 TEST_F(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_3) {
-  aura::RootWindow* root = Shell::GetInstance()->GetRootWindow();
+  aura::RootWindow* root = Shell::GetPrimaryRootWindow();
   root->SetHostSize(gfx::Size(600, 800));
   LOG(ERROR) << "=== Calling OnHostResized, 600x800";
 
   Shell::GetInstance()->SetMonitorWorkAreaInsets(root, gfx::Insets());
 
   window_->SetBounds(gfx::Rect( 300, 100, 300, 200));
   window2_->SetBounds(gfx::Rect(300, 300, 200, 150));
   window3_->SetBounds(gfx::Rect(300, 450, 200, 100));
   delegate2_.set_min_size(gfx::Size(50, 52));
   delegate3_.set_min_size(gfx::Size(50, 38));
@@ skipping 127 matching lines @@
     resizer->Drag(CalculateDragPoint(*resizer, 100, -10), 0);
 
     // 2 should be topmost since it's initially the highest in the stack.
     EXPECT_EQ("2 3 1", WindowOrderAsString());
   }
 }
 
 // Makes sure we don't allow dragging below the work area.
 TEST_F(WorkspaceWindowResizerTest, DontDragOffBottom) {
   Shell::GetInstance()->SetMonitorWorkAreaInsets(
-      Shell::GetInstance()->GetRootWindow(), gfx::Insets(0, 0, 10, 0));
+      Shell::GetPrimaryRootWindow(), gfx::Insets(0, 0, 10, 0));
 
   window_->SetBounds(gfx::Rect(100, 200, 300, 400));
   SetGridSize(0);
   scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
       window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
   ASSERT_TRUE(resizer.get());
   resizer->Drag(CalculateDragPoint(*resizer, 0, 600), 0);
   int expected_y =
       kRootHeight - WorkspaceWindowResizer::kMinOnscreenHeight - 10;
   EXPECT_EQ("100," + base::IntToString(expected_y) + " 300x400",
             window_->bounds().ToString());
 }
 
 // Makes sure we don't allow dragging off the top of the work area.
 TEST_F(WorkspaceWindowResizerTest, DontDragOffTop) {
   Shell::GetInstance()->SetMonitorWorkAreaInsets(
-      Shell::GetInstance()->GetRootWindow(), gfx::Insets(10, 0, 0, 0));
+      Shell::GetPrimaryRootWindow(), gfx::Insets(10, 0, 0, 0));
 
   window_->SetBounds(gfx::Rect(100, 200, 300, 400));
   SetGridSize(0);
   scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
       window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
   ASSERT_TRUE(resizer.get());
   resizer->Drag(CalculateDragPoint(*resizer, 0, -600), 0);
   EXPECT_EQ("100,10 300x400", window_->bounds().ToString());
 }
 
 TEST_F(WorkspaceWindowResizerTest, ResizeBottomOutsideWorkArea) {
   Shell::GetInstance()->SetMonitorWorkAreaInsets(
-      Shell::GetInstance()->GetRootWindow(), gfx::Insets(0, 0, 50, 0));
+      Shell::GetPrimaryRootWindow(), gfx::Insets(0, 0, 50, 0));
 
   window_->SetBounds(gfx::Rect(100, 200, 300, 380));
   SetGridSize(10);
   scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
       window_.get(), gfx::Point(), HTTOP, empty_windows()));
   ASSERT_TRUE(resizer.get());
   resizer->Drag(CalculateDragPoint(*resizer, 8, 0), 0);
   EXPECT_EQ("100,200 300x380", window_->bounds().ToString());
 }
 
@@ skipping 46 matching lines @@
   resizer->Drag(CalculateDragPoint(*resizer, 0, -112 + 20), 0);
   EXPECT_EQ("96,20 320x160", window_->bounds().ToString());
   resizer->Drag(CalculateDragPoint(*resizer, 0, -112 + 7), 0);
   EXPECT_EQ("96,0 320x160", window_->bounds().ToString());
   // No need to test dragging < 0 as we force that to 0.
 }
 
 // Verifies a window taller than work area height doesn't snap above the top of
 // the work area.
 TEST_F(WorkspaceWindowResizerTest, TallWindow) {
-  aura::RootWindow* root = Shell::GetInstance()->GetRootWindow();
+  aura::RootWindow* root = Shell::GetPrimaryRootWindow();
   Shell::GetInstance()->SetMonitorWorkAreaInsets(
       root, gfx::Insets(0, 0, 50, 0));
   window_->SetBounds(gfx::Rect(0, 0, 320, 560));
   SetGridSize(16);
   scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
       window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
   resizer->Drag(CalculateDragPoint(*resizer, 0, 9), 0);
   EXPECT_EQ("0,9 320x560", window_->bounds().ToString());
 }
 
@@ skipping 45 matching lines @@
   resizer->Drag(CalculateDragPoint(*resizer, 10, 12), 0);
   resizer->CompleteDrag(ui::EF_CONTROL_DOWN);
   EXPECT_EQ("106,124 320x160", window_->bounds().ToString());
 }
 
 #endif
 
 }  // namespace
 }  // namespace test
 }  // namespace ash