Removes a couple more functions from WmWindow

ash/wallpaper/wallpaper_controller_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/wallpaper/wallpaper_controller.h"
 
 #include <cmath>
 #include <cstdlib>
 
 #include "ash/ash_switches.h"
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
-#include "ash/shell_port.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_session_controller_client.h"
 #include "ash/test/test_wallpaper_delegate.h"
 #include "ash/wallpaper/wallpaper_view.h"
 #include "ash/wallpaper/wallpaper_widget_controller.h"
 #include "ash/wm_window.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/aura/window.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/test/layer_animator_test_controller.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/widget/widget.h"
 
 using wallpaper::WALLPAPER_LAYOUT_CENTER;
 using wallpaper::WALLPAPER_LAYOUT_CENTER_CROPPED;
 using wallpaper::WALLPAPER_LAYOUT_STRETCH;
 using wallpaper::WALLPAPER_LAYOUT_TILE;
 
 using session_manager::SessionState;
 
 namespace ash {
 namespace {
 
 // Containers IDs used for tests.
 const int kWallpaperId = ash::kShellWindowId_WallpaperContainer;
 const int kLockScreenWallpaperId =
     ash::kShellWindowId_LockScreenWallpaperContainer;
 
 // Returns number of child windows in a shell window container.
 int ChildCountForContainer(int container_id) {
-  WmWindow* root = ShellPort::Get()->GetPrimaryRootWindow();
-  WmWindow* container = root->GetChildByShellWindowId(container_id);
-  return static_cast<int>(container->GetChildren().size());
+  aura::Window* root = Shell::Get()->GetPrimaryRootWindow();
+  aura::Window* container = root->GetChildById(container_id);
+  return static_cast<int>(container->children().size());
 }
 
 // Steps a widget's layer animation until it is completed. Animations must be
 // enabled.
 void RunAnimationForWidget(views::Widget* widget) {
   // Animations must be enabled for stepping to work.
   ASSERT_NE(ui::ScopedAnimationDurationScaleMode::duration_scale_mode(),
             ui::ScopedAnimationDurationScaleMode::ZERO_DURATION);
 
   ui::Layer* layer = widget->GetLayer();
@@ skipping 48 matching lines @@
  public:
   WallpaperControllerTest()
       : controller_(nullptr), wallpaper_delegate_(nullptr) {}
   ~WallpaperControllerTest() override {}
 
   void SetUp() override {
     test::AshTestBase::SetUp();
     // Ash shell initialization creates wallpaper. Reset it so we can manually
     // control wallpaper creation and animation in our tests.
     RootWindowController* root_window_controller =
-        ShellPort::Get()->GetPrimaryRootWindow()->GetRootWindowController();
+        Shell::Get()->GetPrimaryRootWindowController();
     root_window_controller->SetWallpaperWidgetController(nullptr);
     root_window_controller->SetAnimatingWallpaperWidgetController(nullptr);
     controller_ = Shell::Get()->wallpaper_controller();
     wallpaper_delegate_ = static_cast<test::TestWallpaperDelegate*>(
         Shell::Get()->wallpaper_delegate());
     controller_->set_wallpaper_reload_delay_for_test(0);
   }
 
   WallpaperView* wallpaper_view() {
     WallpaperWidgetController* controller =
-        ShellPort::Get()
-            ->GetPrimaryRootWindow()
-            ->GetRootWindowController()
+        Shell::Get()
+            ->GetPrimaryRootWindowController()
             ->animating_wallpaper_widget_controller()
             ->GetController(false);
     EXPECT_TRUE(controller);
     return static_cast<WallpaperView*>(
         controller->widget()->GetContentsView()->child_at(0));
   }
 
  protected:
   // A color that can be passed to CreateImage(). Specifically chosen to not
   // conflict with any of the default wallpaper colors.
@@ skipping 33 matching lines @@
           EXPECT_EQ(SK_ColorBLACK, bitmap.getColor(i, j));
         }
       }
     }
   }
 
   // Runs AnimatingWallpaperWidgetController's animation to completion.
   // TODO(bshe): Don't require tests to run animations; it's slow.
   void RunDesktopControllerAnimation() {
     WallpaperWidgetController* controller =
-        ShellPort::Get()
-            ->GetPrimaryRootWindow()
-            ->GetRootWindowController()
+        Shell::Get()
+            ->GetPrimaryRootWindowController()
             ->animating_wallpaper_widget_controller()
             ->GetController(false);
     EXPECT_TRUE(controller);
     ASSERT_NO_FATAL_FAILURE(RunAnimationForWidget(controller->widget()));
   }
 
   // Convenience function to ensure ShouldCalculateColors() returns true.
   void EnableShelfColoring() {
     const gfx::ImageSkia kImage = CreateImage(10, 10, kCustomWallpaperColor);
     controller_->SetWallpaperImage(kImage, WALLPAPER_LAYOUT_STRETCH);
@@ skipping 56 matching lines @@
   // We cannot short-circuit animations for this test.
   ui::ScopedAnimationDurationScaleMode test_duration_mode(
       ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);
 
   // Create the wallpaper and its view.
   WallpaperController* controller = Shell::Get()->wallpaper_controller();
   controller->CreateEmptyWallpaper();
 
   // The new wallpaper is ready to animate.
   RootWindowController* root_window_controller =
-      ShellPort::Get()->GetPrimaryRootWindow()->GetRootWindowController();
+      Shell::Get()->GetPrimaryRootWindowController();
   EXPECT_TRUE(root_window_controller->animating_wallpaper_widget_controller()
                   ->GetController(false));
   EXPECT_FALSE(root_window_controller->wallpaper_widget_controller());
 
   // Force the animation to play to completion.
   RunDesktopControllerAnimation();
   EXPECT_FALSE(root_window_controller->animating_wallpaper_widget_controller()
                    ->GetController(false));
   EXPECT_TRUE(root_window_controller->wallpaper_widget_controller());
 }
@@ skipping 15 matching lines @@
   // User locks the screen, which moves the wallpaper forward.
   controller->MoveToLockedContainer();
 
   // Suspend/resume cycle causes wallpaper to refresh, loading a new wallpaper
   // that will animate in on top of the old one.
   controller->CreateEmptyWallpaper();
 
   // In this state we have two wallpaper views stored in different properties.
   // Both are in the lock screen wallpaper container.
   RootWindowController* root_window_controller =
-      ShellPort::Get()->GetPrimaryRootWindow()->GetRootWindowController();
+      Shell::Get()->GetPrimaryRootWindowController();
   EXPECT_TRUE(root_window_controller->animating_wallpaper_widget_controller()
                   ->GetController(false));
   EXPECT_TRUE(root_window_controller->wallpaper_widget_controller());
   EXPECT_EQ(0, ChildCountForContainer(kWallpaperId));
   EXPECT_EQ(2, ChildCountForContainer(kLockScreenWallpaperId));
 
   // Before the wallpaper's animation completes, user unlocks the screen, which
   // moves the wallpaper to the back.
   controller->MoveToUnlockedContainer();
 
@@ skipping 20 matching lines @@
   WallpaperController* controller = Shell::Get()->wallpaper_controller();
   controller->CreateEmptyWallpaper();
 
   // Run wallpaper show animation to completion.
   RunDesktopControllerAnimation();
 
   // Change to a new wallpaper.
   controller->CreateEmptyWallpaper();
 
   RootWindowController* root_window_controller =
-      ShellPort::Get()->GetPrimaryRootWindow()->GetRootWindowController();
+      Shell::Get()->GetPrimaryRootWindowController();
   WallpaperWidgetController* animating_controller =
       root_window_controller->animating_wallpaper_widget_controller()
           ->GetController(false);
   EXPECT_TRUE(animating_controller);
   EXPECT_TRUE(root_window_controller->wallpaper_widget_controller());
 
   // Change to another wallpaper before animation finished.
   controller->CreateEmptyWallpaper();
 
   // The animating controller should immediately move to wallpaper controller.
@@ skipping 169 matching lines @@
   EXPECT_TRUE(ShouldCalculateColors());
 
   SetSessionState(SessionState::LOCKED);
   EXPECT_FALSE(ShouldCalculateColors());
 
   SetSessionState(SessionState::LOGIN_SECONDARY);
   EXPECT_FALSE(ShouldCalculateColors());
 }
 
 }  // namespace ash