Handles users rotating screen too early

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
new file mode 100644
index 0000000000000000000000000000000000000000..fd54bd43df73c50ad2040992a63cbea365bacd33
--- /dev/null
+++ b/ash/display/display_configuration_controller_unittest.cc
@@ -0,0 +1,47 @@
+// Copyright 2017 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/wm_shell.h"
+#include "ash/rotator/screen_rotation_animator.h"
+#include "ash/shell.h"
+#include "ash/test/ash_test_base.h"
+#include "ash/test/display_configuration_controller_test_api.h"
+#include "base/macros.h"
+#include "ui/display/manager/display_manager.h"
+
+namespace ash {
+namespace test {
+
+class DisplayConfigurationControllerTest : public AshTestBase {

[bruthig, 2017/03/10 22:34:07]

Thanks for adding this missing test fixture!!

[wutao, 2017/03/14 16:46:37]

Acknowledged.

+ public:
+  DisplayConfigurationControllerTest() {}
+  ~DisplayConfigurationControllerTest() override {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(DisplayConfigurationControllerTest);
+};
+
+TEST_F(DisplayConfigurationControllerTest, ErasesAnimatorOnAnimationEnded) {
+  // TODO(wutao): needs display_configuration_controller.

[bruthig, 2017/03/10 22:34:07]

nit: Any chance you can include a bug number here?  Leaving that as a breadcrumb
might less likely to get missed.

[kylechar, 2017/03/13 14:17:22]

You can include crbug.com/686839 here. We need display animations working in
mash before this test can be updated.

[wutao, 2017/03/14 16:46:37]

Done.

+  if (WmShell::Get()->IsRunningInMash())
+    return;

[bruthig, 2017/03/10 22:34:07]

FYI I've proposed a change to the mus+ash team about this pattern for disabling
tests
(https://groups.google.com/a/google.com/forum/#!topic/mustash-team/TBmk6vWoXLw).

I don't expect much push back on the proposal so it might be a good idea to use
it in this CL as a concrete first use.  It applies here and elsewhere.

[wutao, 2017/03/14 16:46:37]

As discussed offline and in the proposal thread, I will leave as it here but use
the proposed pattern in the screen_rotation_animator_unittest file.

+
+  display::Display display = display::Screen::GetScreen()->GetPrimaryDisplay();
+  DisplayConfigurationControllerTestApi testapi(
+      Shell::GetInstance()->display_configuration_controller());
+  ScreenRotationAnimator* screen_rotation_animator =
+      testapi.GetScreenRotationAnimatorForDisplay(display.id());
+  EXPECT_EQ(1, testapi.DisplayScreenRotationAnimatorMapSize());
+
+  Shell::GetInstance()->display_manager()->SetDisplayRotation(
+      display.id(), display::Display::ROTATE_0,
+      display::Display::RotationSource::ROTATION_SOURCE_USER);
+  screen_rotation_animator->Rotate(
+      display::Display::ROTATE_90,
+      display::Display::RotationSource::ROTATION_SOURCE_USER);
+  EXPECT_EQ(0, testapi.DisplayScreenRotationAnimatorMapSize());
+}
+
+}  // namespace test
+}  // namespace ash