[merge to m60] cros: Do not cache |root_window| in ScreenRotationAnimator.

ash/display/display_configuration_controller_unittest.cc

Index: ash/display/display_configuration_controller_unittest.cc
diff --git a/ash/display/display_configuration_controller_unittest.cc b/ash/display/display_configuration_controller_unittest.cc
index 6b99ad2f02ec907984f840b9362e1d8594ad6374..c62efff074a609f22e2bb407083507e18de3977c 100644
--- a/ash/display/display_configuration_controller_unittest.cc
+++ b/ash/display/display_configuration_controller_unittest.cc
@@ -23,24 +23,22 @@ TEST_F(DisplayConfigurationControllerTest, OnlyHasOneAnimator) {
   display::Display display = display::Screen::GetScreen()->GetPrimaryDisplay();
   test::DisplayConfigurationControllerTestApi testapi(
       Shell::Get()->display_configuration_controller());
-  ScreenRotationAnimator* screen_rotation_animator =
+  ScreenRotationAnimator* old_screen_rotation_animator =
       testapi.GetScreenRotationAnimatorForDisplay(display.id());
-  EXPECT_EQ(1, testapi.DisplayScreenRotationAnimatorMapSize());
 
   Shell::Get()->display_manager()->SetDisplayRotation(
       display.id(), display::Display::ROTATE_0,
       display::Display::RotationSource::ROTATION_SOURCE_USER);
-  screen_rotation_animator->Rotate(
+  old_screen_rotation_animator->Rotate(
       display::Display::ROTATE_90,
       display::Display::RotationSource::ROTATION_SOURCE_USER);
-  EXPECT_EQ(1, testapi.DisplayScreenRotationAnimatorMapSize());
 
-  screen_rotation_animator =
+  ScreenRotationAnimator* new_screen_rotation_animator =
       testapi.GetScreenRotationAnimatorForDisplay(display.id());
-  screen_rotation_animator->Rotate(
+  new_screen_rotation_animator->Rotate(
       display::Display::ROTATE_180,
       display::Display::RotationSource::ROTATION_SOURCE_USER);
-  EXPECT_EQ(1, testapi.DisplayScreenRotationAnimatorMapSize());
+  EXPECT_EQ(old_screen_rotation_animator, new_screen_rotation_animator);
 }
 
 }  // namespace ash