Folds WmRootWindowController into RootWindowController

ash/common/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/common/wallpaper/wallpaper_controller.h"
 
 #include <cmath>
 #include <cstdlib>
 
 #include "ash/common/wallpaper/wallpaper_view.h"
 #include "ash/common/wallpaper/wallpaper_widget_controller.h"
-#include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
+#include "ash/root_window_controller.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_wallpaper_delegate.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/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/test/layer_animator_test_controller.h"
@@ skipping 78 matching lines @@
 class WallpaperControllerTest : public test::AshTestBase {
  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.
-    WmRootWindowController* root_window_controller =
+    RootWindowController* root_window_controller =
         WmShell::Get()->GetPrimaryRootWindow()->GetRootWindowController();
     root_window_controller->SetWallpaperWidgetController(nullptr);
     root_window_controller->SetAnimatingWallpaperWidgetController(nullptr);
     controller_ = WmShell::Get()->wallpaper_controller();
     wallpaper_delegate_ = static_cast<test::TestWallpaperDelegate*>(
         WmShell::Get()->wallpaper_delegate());
     controller_->set_wallpaper_reload_delay_for_test(0);
   }
 
   WallpaperView* wallpaper_view() {
@@ skipping 104 matching lines @@
 TEST_F(WallpaperControllerTest, ControllerOwnership) {
   // 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 = WmShell::Get()->wallpaper_controller();
   controller->CreateEmptyWallpaper();
 
   // The new wallpaper is ready to animate.
-  WmRootWindowController* root_window_controller =
+  RootWindowController* root_window_controller =
       WmShell::Get()->GetPrimaryRootWindow()->GetRootWindowController();
   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.
-  WmRootWindowController* root_window_controller =
+  RootWindowController* root_window_controller =
       WmShell::Get()->GetPrimaryRootWindow()->GetRootWindowController();
   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 @@
   // Reset wallpaper state, see ControllerOwnership above.
   WallpaperController* controller = WmShell::Get()->wallpaper_controller();
   controller->CreateEmptyWallpaper();
 
   // Run wallpaper show animation to completion.
   RunDesktopControllerAnimation();
 
   // Change to a new wallpaper.
   controller->CreateEmptyWallpaper();
 
-  WmRootWindowController* root_window_controller =
+  RootWindowController* root_window_controller =
       WmShell::Get()->GetPrimaryRootWindow()->GetRootWindowController();
   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();
 
@@ skipping 140 matching lines @@
   {
     SCOPED_TRACE(base::StringPrintf("1200x600/u@1.5 low resolution"));
     controller_->SetWallpaperImage(image_low_res, WALLPAPER_LAYOUT_CENTER);
     WallpaperFitToNativeResolution(
         wallpaper_view(), low_dsf, low_resolution.width(),
         low_resolution.height(), kCustomWallpaperColor);
   }
 }
 
 }  // namespace ash